@@ -56,13 +55,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 {
@@ -82,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,11 +126,12 @@ public final class Box extends JS.Scope {
private LENGTH hpad = 0;
private LENGTH vpad = 0;
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;
@@ -118,8 +142,8 @@ public final class Box extends JS.Scope {
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 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;
@@ -136,20 +160,13 @@ 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(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);
@@ -160,6 +177,10 @@ public final class Box extends JS.Scope {
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);
}
/**
@@ -172,9 +193,9 @@ 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;
@@ -215,9 +236,14 @@ public final class Box extends JS.Scope {
// --- 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)
@@ -226,7 +252,7 @@ public final class Box extends JS.Scope {
if (rows == 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 & 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
@@ -241,7 +267,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 & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
}
}
}
@@ -257,7 +283,7 @@ public final class Box extends JS.Scope {
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