X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=4da565a2a54f997b98595df1aee3b80dff83bf61;hb=cf3587e2fd5966b7ebfd721d9413674224d1ad2a;hp=affcbb0b41b5a0d841f35fcb6763d97877be0102;hpb=5518e5d03a513174d17bfa82a177ecceeb116272;p=org.ibex.core.git
diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index affcbb0..4da565a 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -3,11 +3,13 @@ package org.xwt;
// **** This file must be preprocessed before compilation ****
+// 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 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
+// 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
// FEATURE: separate mark_for_reflow and mark_for_resize
@@ -17,6 +19,7 @@ import java.net.*;
import java.util.*;
import org.xwt.js.*;
import org.xwt.util.*;
+import org.xwt.translators.*;
/**
*
@@ -52,10 +55,11 @@ import org.xwt.util.*;
* 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
@@ -78,12 +82,35 @@ 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
+
+ // FEATURE: combine this with the JSObject Hash
Hash traps = null;
+ // Flags ///////////////////////////////////////////////////////////////////////////////
+ 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;
+
+
// Geometry ////////////////////////////////////////////////////////////////////////////
// xwt can be compiled with 16-bit lengths to save memory on small devices
@@ -103,7 +130,7 @@ public final class Box extends JS.Scope {
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;
@@ -112,11 +139,11 @@ public final class Box extends JS.Scope {
// computed during reflow
LENGTH x = 0;
LENGTH y = 0;
- LENGTH width = 0;
- LENGTH height = 0;
- private int row = 0; // FIXME short
- private int col = 0; // FIXME short
- private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth) + pad)
+ public LENGTH width = 0;
+ public LENGTH height = 0;
+ private int row = 0; // FEATURE use a short
+ private int col = 0; // FEATURE use a short
+ private LENGTH contentwidth = 0; // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad)
private LENGTH contentheight = 0;
@@ -132,27 +159,27 @@ public final class Box extends JS.Scope {
private String cursor = null; // the cursor for this box
- //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?
// 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(x, y, width, height); }
+ public final void dirty() { 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, this.x + this.width) - max(x, this.x);
- h = min(y + h, this.y + this.height) - max(y, this.y);
- x = max(x, this.x);
- y = max(y, this.y);
+ 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);
}
/**
@@ -165,26 +192,25 @@ 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", this);
- else if (wasinside && !isinside && traps.get("Leave") != null) put("Leave", this);
- else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && traps.get("Move") != null) put("Move", this);
+ 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 (isinside && cursor != null) getRoot().cursor = cursor;
// if the mouse has moved into our padding region, it is considered 'outside' all our children
- if (!(mousex >= x + hpad && mousey >= y + vpad &&
- mousex < x + width - hpad && mousey < y + height + vpad)) forceleave = true;
+ if (!(mousex >= hpad && mousey >= vpad && mousex < width - hpad && mousey < height + vpad)) forceleave = true;
for(Box b = getChild(numChildren() - 1); b != null; b = b.prevSibling()) {
- b.Move(oldmousex, oldmousey, mousex, mousey, forceleave);
- if (b.inside(mousex, mousey)) forceleave = true;
+ b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave);
+ if (b.inside(mousex - b.x, mousey - b.y)) forceleave = true;
}
}
@@ -199,37 +225,48 @@ public final class Box extends JS.Scope {
/** 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 || numChildren() == 0) return;
+ if (!needs_reflow) return;
+ if (numChildren() == 0) {
+ contentwidth = max(textwidth + 2 * hpad, minwidth);
+ contentheight = max(textheight + 2 * vpad, minheight);
+ return;
+ }
// --- 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 colspan/rowspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
+ //#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) {
int[] numRowsInCol = new int[cols]; // the number of cells occupied in each column
Box child = getChild(0);
- for(child = child.nextSibling(); child != null && (child.absolute || child.invisible); child = child.nextSibling());
+ for(; child != null && (((child.flags & ABSOLUTE_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
while(col < cols && numRowsInCol[col] > row) col++;
- for(int i=col; i < cols && i < col + child.colspan; i++)
+ for(int i=col; i < cols && i < col + min(cols, child.colspan); i++)
if (numRowsInCol[col] > row) { col = i + 1; continue INNER; }
break;
}
- if (col + child.colspan >= cols) break;
- for(int i=col; i < col + child.colspan; i++) numRowsInCol[i] += child.rowspan;
+ if (col + min(cols, child.colspan) > cols) break;
+ for(int i=col; i < col + min(cols, child.colspan); i++) numRowsInCol[i] += child.rowspan;
child.col = col;
child.row = row;
- col += child.colspan;
- for(child = child.nextSibling(); child != null && (child.absolute || child.invisible); child = child.nextSibling());
+ col += min(cols, child.colspan);
+ child = child.nextSibling();
+ for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
}
}
}
@@ -237,14 +274,18 @@ 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
- contentwidth = 0;
- LENGTH[] colWidth = new LENGTH[(cols == 0 ? (getChild(numChildren() - 1).col + 1) : cols)];
+ //#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)
+ 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))
+ if (!(((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)))
colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
- for(int col=0; col 0)
while(slack > 0) {
// FEATURE: inefficient
int startslack = slack;
- int increment = max(1, slack / (cols == 0 ? (getChild(numChildren() - 1).col + 1) : cols));
- for(int col=0; col < (cols == 0 ? (getChild(numChildren() - 1).col + 1) : cols) && slack > 0; col++) {
+ int increment = max(1, slack / numCols);
+ for(int col=0; col < numCols && slack > 0; col++) {
slack += colWidth[col];
colWidth[col] = min(colMaxWidth[col], colWidth[col] + increment);
slack -= colWidth[col];
@@ -330,17 +378,24 @@ public final class Box extends JS.Scope {
// --- Phase 4 ----------------------------------------------------------------------
// assign children's new sizes and positions and recurse
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
- if (child.absolute || child.invisible) continue;
- int diff;
-
- //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight hshrink/vshrink marginWidth/marginHeight
- child.width = 0; for(int i=child.col; i i) {
- for(int j = x + hpad; j < x + hpad + textdim(0); j += 2)
- buf.fillRect(j, y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
- j + 1, y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
- textcolor);
-
- } else if (font().lastIndexOf('u') > i) {
- buf.fillRect(x + hpad,
- y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
- x + hpad + textdim(0),
- y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
- textcolor);
- }
- */
+ void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
+ /*
+ // hack because (believe it or not) libgcj doesn't support UTF16.
+ byte[] b = new byte[text.length() * 2 + 2];
+ for(int i=0; i> 8);
+ b[i * 2 + 1] = (byte)(((short)text.charAt(i)) & 0xff);
+ }
+ b[text.length()] = 0;
+ b[text.length() + 1] = 0;
+ */
+ /*
+ try {
+ ImageDecoder id = org.xwt.translators.Font.render(new FileInputStream("COMIC.TTF"), 24, text, false);
+ Picture p = Platform.createPicture(id);
+ // FIXME: clipping (don't use setClip)
+ buf.drawPicture(p,
+ x + hpad, y + vpad,
+ x + hpad + p.getWidth(), y + vpad + p.getHeight(),
+ 0, 0,
+ p.getWidth(), p.getHeight());
+ } catch (Exception e) {
+ Log.log(this, e);
+ }
+ */
}
@@ -463,7 +514,17 @@ public final class Box extends JS.Scope {
} else if ("apply".equals(method)) {
if (checkOnly) return Boolean.TRUE;
- if (args.elementAt(0) instanceof String) {
+ if (args.elementAt(0) instanceof Res) {
+ Res res = (Res)args.elementAt(0);
+ res = res.addExtension(".xwt");
+ Template t = Template.buildTemplate(res, "fromResource");
+ if (ThreadMessage.suspendThread()) try {
+ JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
+ t.apply(this, null, null, callback, 0, t.numUnits());
+ } finally {
+ ThreadMessage.resumeThread();
+ }
+ } else if (args.elementAt(0) instanceof String) {
String templatename = (String)args.elementAt(0);
Template t = Template.getTemplate(templatename, null);
if (t == null) {
@@ -584,6 +645,7 @@ public final class Box extends JS.Scope {
}
}
+ 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());
@@ -625,6 +687,7 @@ public final class Box extends JS.Scope {
* @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) { super.put(name, value); }
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) {
@@ -708,7 +771,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);
@@ -823,7 +886,9 @@ public final class Box extends JS.Scope {
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.callMethod(method,args,justChecking); }
+ public Object callMethod(Object method, JS.Array args, boolean justChecking) {
+ return ((Box)box).callMethod(method,args,justChecking);
+ }
}
@@ -835,23 +900,31 @@ public final class Box extends JS.Scope {
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 >= this.x && y >= this.y && x < this.x + width && y < this.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) {
+ if (cur.parent != null) throw new Error("whoIs may only be invoked on the root box of a surface");
+ int globalx = 0;
+ int globaly = 0;
+
// WARNING: this method is called from the event-queueing
// thread -- it may run concurrently with ANY part of XWT, and
// is UNSYNCHRONIZED for performance reasons. BE CAREFUL
// HERE.
- if (cur.invisible) return null;
- if (!cur.inside(x,y)) return cur.parent == null ? cur : 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--) {
Box child = cur.getChild(i);
if (child == null) continue; // since this method is unsynchronized, we have to double-check
- if (!child.invisible && child.inside(x,y)) { cur = child; continue OUTER; }
+ globalx += child.x;
+ globaly += child.y;
+ if (!((child.flags & INVISIBLE_FLAG) != 0) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; }
+ globalx -= child.x;
+ globaly -= child.y;
}
break;
}
@@ -913,7 +986,8 @@ public final class Box extends JS.Scope {
Log.log(this, "invalid color " + s);
return;
}
- // FIXME put named colors back in
+ 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();
@@ -921,18 +995,45 @@ 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); }
+ });
+
+ 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("text", new SpecialBoxProperty() {
public Object get(Box b) { return b.text; }
public void put(Box b, Object value) {
String t = value == null ? "null" : value.toString();
if (t.equals(b.text)) return;
- // FIXME text is broken
+ b.text = t;
+ if (t == null) {
+ if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b;
+ b.textwidth = b.textheight = 0;
+ } else {
+ try {
+ ImageDecoder id = org.xwt.translators.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();
+ } catch (Exception e) {
+ Log.log(this, e);
+ }
+ }
+ b.dirty();
} });
+
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();
- //b.fontChanged();
+ // FIXME: translate value into a resource
+ MARK_FOR_REFLOW_b;
+ b.flags |= FONT_CHANGED_FLAG;
b.dirty();
} });
@@ -947,6 +1048,7 @@ public final class Box extends JS.Scope {
specialBoxProperties.put("orient", new SpecialBoxProperty() {
public Object get(Box b) {
+ Log.log(this, "warning: the orient property is deprecated");
if (b.redirect == null) return "horizontal";
else if (b.redirect != b) return get(b.redirect);
else if (b.cols == 1) return "vertical";
@@ -954,6 +1056,7 @@ public final class Box extends JS.Scope {
else return "grid";
}
public void put(Box b, Object value) {
+ Log.log(this, "warning: the orient property is deprecated");
if (value == null) return;
if (b.redirect == null) return;
if (b.redirect != b) { put(b.redirect, value); return; }
@@ -982,17 +1085,17 @@ public final class Box extends JS.Scope {
});
specialBoxProperties.put("shrink", new SpecialBoxProperty() {
- public Object get(Box b) { return (b.vshrink && b.hshrink) ? Boolean.TRUE : Boolean.FALSE; }
+ 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); }
});
- //#repeat hshrink/vshrink
+ //#repeat hshrink/vshrink HSHRINK_FLAG/VSHRINK_FLAG
specialBoxProperties.put("hshrink", new SpecialBoxProperty() {
- public Object get(Box b) { return new Boolean(b.hshrink); }
+ public Object get(Box b) { return new Boolean((b.flags & HSHRINK_FLAG) != 0); }
public void put(Box b, Object value) {
boolean newshrink = stob(value);
- if (b.hshrink == newshrink) return;
- b.hshrink = newshrink;
+ if (((b.flags & HSHRINK_FLAG) != 0) == newshrink) return;
+ if (newshrink) b.flags |= HSHRINK_FLAG; else b.flags &= ~HSHRINK_FLAG;
MARK_FOR_REFLOW_b;
}
});
@@ -1002,16 +1105,21 @@ public final class Box extends JS.Scope {
specialBoxProperties.put("x", new SpecialBoxProperty() {
public Object get(Box b) {
if (b.surface == null) return new Integer(0);
- if (b.invisible) return new Integer(0);
+ if ((b.flags & INVISIBLE_FLAG) != 0) return new Integer(0);
return new Integer(b.x);
}
public void put(Box b, Object value) {
- b.x = stoi(value);
+ if (!((b.flags & ABSOLUTE_FLAG) != 0)) return;
+ int x = stoi(value);
+ if (x == b.x) return;
+ b.dirty();
+ b.x = x;
if (b.parent == null && b.surface != null) {
- // FIXME this gets hosed by the #repeat
- //b.surface.setLocation(b.x, b.y);
+ b.surface.setLocation();
b.surface.centerSurfaceOnRender = false;
}
+ MARK_FOR_REFLOW_b;
+ b.dirty();
}
});
//#end
@@ -1022,11 +1130,10 @@ public final class Box extends JS.Scope {
public void put(Box b, Object value) {
b.width = stoi(value);
if (b.parent == null && b.surface != null) {
- // FIXME this gets hosed...
- //b.surface.setSize(max(Surface.scarPicture.getWidth(), b.width),
- //max(Surface.scarPicture.getHeight(), b.height));
+ b.surface.setSize();
MARK_FOR_REFLOW_b;
} else {
+ if (b.minwidth == b.width && b.maxwidth == b.width) return;
b.minwidth = b.maxwidth = b.width;
MARK_FOR_REFLOW_b;
}
@@ -1037,6 +1144,7 @@ public final class Box extends JS.Scope {
specialBoxProperties.put("cols", new SpecialBoxProperty() {
public Object get(Box b) { return new Double(b.cols); }
public void put(Box b, Object value) {
+ if (b.cols == stoi(value)) return;
b.cols = stoi(value);
if (b.cols == 0 && b.rows == 0) b.rows = 1;
if (b.cols != 0 && b.rows != 0) b.rows = 0;
@@ -1047,30 +1155,33 @@ public final class Box extends JS.Scope {
//#repeat colspan/rowspan
specialBoxProperties.put("colspan", new SpecialBoxProperty() {
public Object get(Box b) { return new Double(b.colspan); }
- public void put(Box b, Object value) { b.colspan = stoi(value); MARK_FOR_REFLOW_b; }
+ public void put(Box b, Object value) {
+ if (b.colspan == stoi(value)) return;
+ b.colspan = stoi(value);
+ MARK_FOR_REFLOW_b;
+ }
});
//#end
specialBoxProperties.put("tile", new SpecialBoxProperty() {
- public Object get(Box b) { return b.tile ? Boolean.TRUE : Boolean.FALSE; }
+ public Object get(Box b) { return ((b.flags & TILE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
public void put(Box b, Object value) {
- boolean newtile = stob(value);
- if (newtile == b.tile) return;
- b.tile = newtile;
+ if (((b.flags & TILE_FLAG) != 0) == stob(value)) return;
+ if (stob(value)) b.flags |= TILE_FLAG; else b.flags &= ~TILE_FLAG;
b.dirty();
} });
specialBoxProperties.put("invisible", new SpecialBoxProperty() {
public Object get(Box b) {
- for (Box cur = b; cur != null; cur = cur.parent) { if (cur.invisible) return Boolean.TRUE; }
+ for (Box cur = b; cur != null; cur = cur.parent) {
+ if ((cur.flags & INVISIBLE_FLAG) != 0) return Boolean.TRUE; }
return Boolean.FALSE;
}
public void put(Box b, Object value) {
- boolean newinvisible = stob(value);
- if (newinvisible == b.invisible) return;
- b.invisible = newinvisible;
+ 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(newinvisible);
+ if (b.surface != null) b.surface.setInvisible((b.flags & INVISIBLE_FLAG) != 0);
} else {
b.dirty();
MARK_FOR_REFLOW_b_parent;
@@ -1079,11 +1190,11 @@ public final class Box extends JS.Scope {
}});
specialBoxProperties.put("absolute", new SpecialBoxProperty() {
- public Object get(Box b) { return b.absolute ? Boolean.TRUE : Boolean.FALSE; }
+ public Object get(Box b) { return ((b.flags & ABSOLUTE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
public void put(Box b, Object value) {
- boolean newabsolute = stob(value);
- if (newabsolute == b.absolute) return;
- b.absolute = newabsolute;
+ if (stob(value) == ((b.flags & ABSOLUTE_FLAG) != 0)) return;
+ if (stob(value)) b.flags |= ABSOLUTE_FLAG; else b.flags &= ~ABSOLUTE_FLAG;
+ if ((b.flags & ABSOLUTE_FLAG) != 0) { b.x = 0; b.y = 0; }
if (b.parent != null) MARK_FOR_REFLOW_b_parent;
} });
@@ -1098,8 +1209,9 @@ public final class Box extends JS.Scope {
if ((b.image = ImageDecoder.getPicture(s)) == null) {
if (Log.on) Log.logJS(Box.class, "unable to load image " + s);
} else {
- b.minwidth = b.maxwidth = b.image.getWidth();
- b.minheight = b.maxheight = b.image.getHeight();
+ b.minwidth = b.image.getWidth();
+ b.minheight = b.image.getHeight();
+ MARK_FOR_REFLOW_b;
}
}
b.dirty();
@@ -1112,6 +1224,7 @@ public final class Box extends JS.Scope {
public void put(Box b, Object value) {
if (b.surface == null || b.parent == null) return;
b.put("x", new Integer(stoi(value) - stoi(get(b.parent))));
+ MARK_FOR_REFLOW_b;
}
});
//#end
@@ -1132,7 +1245,13 @@ public final class Box extends JS.Scope {
//#repeat mousex/mousey x/y
specialBoxProperties.put("mousex", new SpecialBoxProperty() {
- public Object get(Box b) { return new Integer(b.getRoot().surface == null ? 0 : b.getRoot().surface.mousex - b.x); }
+ public Object get(Box b) {
+ Surface surface = b.getRoot().surface;
+ if (surface == null) return new Integer(0);
+ int mousex = surface.mousex;
+ for(Box cur = b; cur != null && cur.parent != null; cur = cur.parent) mousex -= cur.x;
+ return new Integer(mousex);
+ }
});
//#end
@@ -1141,7 +1260,8 @@ public final class Box extends JS.Scope {
});
specialBoxProperties.put("mouseinside", new SpecialBoxProperty() {
- public Object get(Box b) { return b.mouseinside ? Boolean.TRUE : Boolean.FALSE; }
+ public Object get(Box b) {
+ return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
});
specialBoxProperties.put("numchildren", new SpecialBoxProperty() {
@@ -1155,10 +1275,15 @@ public final class Box extends JS.Scope {
public void put(String name, Box b, Object value) {
Surface surface = b.getRoot().surface;
if (surface == null) return;
+ int mousex = surface.mousex;
+ int mousey = surface.mousey;
+ for(Box c = b.parent; c != null && c.parent != null; c = c.parent) {
+ mousex -= c.x;
+ mousey -= c.y;
+ }
for(Box c = b.prevSibling(); c != null; c = c.prevSibling()) {
- Box siblingChild = whoIs(c, surface.mousex, surface.mousey);
- if (siblingChild != null) {
- siblingChild.put(name, value);
+ if (c.inside(mousex - c.x, mousey - c.y)) {
+ c.put(name, value);
return;
}
}
@@ -1226,7 +1351,7 @@ public final class Box extends JS.Scope {
public void put(Box b, Object value) {
if (b.parent == null && b.surface != null) {
b.surface.hscar = stoi(value);
- b.surface.dirty(0, 0, b.surface.width, b.surface.height);
+ b.surface.dirty(0, 0, b.width, b.height);
b.surface.Refresh();
}
}
@@ -1240,8 +1365,8 @@ public final class Box extends JS.Scope {
});
// these are all do-nothings; just to prevent space from getting taken up in the params Hash.
- specialBoxProperties.put("KeyPressed", new SpecialBoxProperty()); // FIXME should cascade
- specialBoxProperties.put("KeyReleased", new SpecialBoxProperty()); // FIXME should cascade
+ specialBoxProperties.put("KeyPressed", new SpecialBoxProperty());
+ specialBoxProperties.put("KeyReleased", new SpecialBoxProperty());
specialBoxProperties.put("PosChange", new SpecialBoxProperty());
specialBoxProperties.put("SizeChange", new SpecialBoxProperty());
@@ -1291,46 +1416,46 @@ public final class Box extends JS.Scope {
}
});
- /*
- // FIXME: need to be able to read this back
+ // FEATURE: this still isn't totally harmonious; when you createSurface, these aren't checked
specialBoxProperties.put("titlebar", new SpecialBoxProperty() {
- public void put(Box b, Object value) { surface.setTitleBarText(value.toString()); }
- public Object get(Box b) { return b.ti; }
+ public void put(Box b, Object value) {
+ if (b.surface != null) b.surface.setTitleBarText(value.toString());
+ b.put_("titlebar", value);
+ }
+ public Object get(Box b) { return b.get_("titlebar"); }
});
- // FIXME: need to be able to read this back
specialBoxProperties.put("icon", new SpecialBoxProperty() {
public void put(Box b, Object value) {
- Picture pic = Box.getPicture(value.toString());
- if (pic != null) surface.setIcon(pic);
+ b.put_("icon", value);
+ if (b.surface == null) return;
+ Picture pic = ImageDecoder.getPicture(value.toString());
+ if (pic != null) b.surface.setIcon(pic);
else if (Log.on) Log.log(this, "unable to load icon " + value);
}
- public Object get(Box b) { return b.id; }
+ public Object get(Box b) { return b.get_("icon"); }
});
- */
}
+ }
-
- /** helper that converts a String to a boolean according to JavaScript coercion rules */
- public static boolean stob(Object o) {
- if (o == null) return false;
- return Boolean.TRUE.equals(o) || "true".equals(o);
- }
+ /** helper that converts a String to a boolean according to JavaScript coercion rules */
+ public static boolean stob(Object o) {
+ if (o == null) return false;
+ return Boolean.TRUE.equals(o) || "true".equals(o);
+ }
+ /** helper that converts a String to an int according to JavaScript coercion rules */
+ public static int stoi(Object o) {
+ if (o == null) return 0;
+ if (o instanceof Integer) return ((Integer)o).intValue();
+
+ String s;
+ if (!(o instanceof String)) s = o.toString();
+ else s = (String)o;
+ try { return Integer.parseInt(s.indexOf('.') == -1 ? s : s.substring(0, s.indexOf('.'))); }
+ catch (NumberFormatException e) { return 0; }
}
- /** helper that converts a String to an int according to JavaScript coercion rules */
- public static int stoi(Object o) {
- if (o == null) return 0;
- if (o instanceof Integer) return ((Integer)o).intValue();
-
- String s;
- if (!(o instanceof String)) s = o.toString();
- else s = (String)o;
-
- try { return Integer.parseInt(s.indexOf('.') == -1 ? s : s.substring(0, s.indexOf('.'))); }
- catch (NumberFormatException e) { return 0; }
- }
}