X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=09035f9c5dd758a35999c35e6ec0448480e67dcf;hb=5e8485ac88b45693b5cdb8e70f346b92732eb91f;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..09035f9 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -3,11 +3,10 @@ package org.xwt; // **** This file must be preprocessed before compilation **** -// 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 +// RULE: coordinates on non-static methods are ALWAYS relative to the +// upper-left hand corner of this + +// 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 +16,7 @@ import java.net.*; import java.util.*; import org.xwt.js.*; import org.xwt.util.*; +import org.xwt.translators.*; /** *
@@ -52,13 +52,14 @@ 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
+ * 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 {
@@ -68,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 ////////////////////////////////////////////////////////////////
@@ -78,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 ////////////////////////////////////////////////////////////////////////////
@@ -92,66 +103,76 @@ 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;
- 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;
- 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 x = 0;
+ public LENGTH y = 0;
+ 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;
+ 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 VectorGraphics.RasterPath rpath = null;
+ private VectorGraphics.Affine rtransform = null;
- private Picture image; // will disappear
- private int fillcolor = 0x00000000; // will become SVG.Paint
- private int strokecolor = 0xFF000000; // will become SVG.Paint
+ //private VectorGraphics.Paint fill = null;
+ //private VectorGraphics.Paint stroke = null;
+ int strokewidth = 1;
+
+ 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
- //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() {
+ 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, 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);
+ 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;
}
}
@@ -165,71 +186,78 @@ 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);
+ 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 >= 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;
}
}
// 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 */
void repack() {
- if (!needs_reflow || numChildren() == 0) return;
+ if (!needs_reflow) 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 colspan/rowspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
- if (rows == 0) {
+ //#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 && numChildren() != 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 & 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
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 & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
}
}
}
@@ -237,37 +265,63 @@ 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)];
- 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