// **** This file must be preprocessed before compilation ****
+// RULE: coordinates on non-static methods are ALWAYS relative to the
+// upper-left hand corner of <tt>this</tt>
+
// FIXME: align
// FIXME use bitfields
// FIXME fixedaspect
// 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;
}
}
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;
}
}
/** 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 = minwidth; contentheight = minheight; return; }
// --- Phase 0 ----------------------------------------------------------------------
// recurse
// --- 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.absolute || child.invisible); 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.absolute || child.invisible); child = child.nextSibling());
}
}
}
// --- 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))
colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
- for(int col=0; col<cols; col++) contentwidth += colWidth[col];
- contentwidth = max(textwidth, contentwidth);
+ for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
+ contentwidth = max(textwidth + 2 * hpad, contentwidth);
contentwidth = bound(minwidth, contentwidth, maxwidth);
//#end
}
// --- Phase 1 ----------------------------------------------------------------------
// run PosChange/SizeChange, dirty as needed
if (x != this.x || y != this.y || width != this.width || height != this.height) {
- parent.dirty(this.x, this.y, this.width, this.height);
- dirty(x, y, width, height);
+ (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
boolean sizechange = false, poschange = false;
if (traps != null && (this.width != width || this.height != height) && traps.get("SizeChange") != null) sizechange = true;
if (traps != null && (this.x != x || this.y != y) && traps.get("PosChange") != null) poschange = true;
this.width = width; this.height = height; this.x = x; this.y = y;
+ dirty();
if (sizechange || poschange)
if (sizePosChangesSinceLastRender == 500) {
if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render");
// --- Phase 2 ----------------------------------------------------------------------
// compute the min/max sizes of the columns and rows and set initial width/height to minimums
- //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight marginWidth/marginHeight
- LENGTH[] colWidth = new LENGTH[(cols == 0 ? (getChild(numChildren() - 1).col + 1) : cols)];
- LENGTH[] colMaxWidth = 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 marginWidth/marginHeight numCols/numRows
+ 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];
+ LENGTH[] colMaxWidth = new LENGTH[numCols];
int marginWidth = width;
- for(int i=0; i<colMaxWidth.length; i++) colMaxWidth[i] = MAX_LENGTH;
+ for(int i=0; i<colMaxWidth.length; i++) colMaxWidth[i] = -1;
//#end
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
if (child.absolute || child.invisible) continue;
- //#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
+ //#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 numCols/numRows
colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
- colMaxWidth[child.col] = min(colMaxWidth[child.col], (child.hshrink ? child.minwidth : child.maxwidth) / child.colspan);
+ for(int i=child.col; i<child.col+child.colspan && i<numCols; i++)
+ colMaxWidth[i] = max(colMaxWidth[i], (child.hshrink ? child.contentwidth : child.maxwidth) / child.colspan);
//#end
}
//#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight marginWidth/marginHeight
+ for(int i=0; i<colMaxWidth.length; i++) if (colMaxWidth[i] == -1) colMaxWidth[i] = MAX_LENGTH;
+
for(int i=0; i<colMaxWidth.length; i++) {
if (colMaxWidth[i] == MAX_LENGTH) { marginWidth = 0; break; }
marginWidth -= colMaxWidth[i];
// --- Phase 3 ----------------------------------------------------------------------
// hand out the slack
int slack;
- //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight
+ //#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
slack = width;
- for(int i=0; i<cols; i++) slack -= colWidth[i];
+ for(int i=0; i<numCols; i++) slack -= colWidth[i];
if (numChildren() > 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];
// --- 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<child.colspan; i++) child.width += colWidth[i];
- diff = bound(child.contentwidth, child.width, child.hshrink ? child.contentwidth : child.maxwidth) - child.width;
- child.x = marginWidth / 2; for(int i=0; i<child.col; i++) child.x += colWidth[i];
- if (diff < 0) child.x += -1 * (diff / 2);
- //#end
-
- child.resize(child.x, child.y, child.width, child.height);
+ if (child.invisible) continue;
+ int child_x = 0, child_y = 0, child_width = 0, child_height = 0;
+ if (child.absolute) {
+ child_x = child.x;
+ child_y = child.y;
+ child_width = child.hshrink ? child.contentwidth : min(child.maxwidth, width - child.x - hpad);
+ child_height = child.vshrink ? child.contentheight : min(child.maxheight, height - child.y - vpad);
+ } else {
+ 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 hpad/vpad child_x/child_y child_width/child_height
+ child_width = 0; for(int i=child.col; i<child.col+child.colspan && i<colWidth.length; i++) child_width += colWidth[i];
+ diff = bound(child.contentwidth, child_width, child.hshrink ? child.contentwidth : child.maxwidth) - child_width;
+ child_x = max(hpad, marginWidth / 2); for(int i=0; i<child.col; i++) child_x += colWidth[i];
+ if (diff < 0) child_x += -1 * (diff / 2);
+ child_width += diff;
+ //#end
+ }
+ child.resize(child_x, child_y, child_width, child_height);
}
}
// Rendering Pipeline /////////////////////////////////////////////////////////////////////
/** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
- void render(int xIn, int yIn, int wIn, int hIn, DoubleBuffer buf) {
+ void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
if (Surface.abort || invisible) return;
+ int globalx = parentx + (parent == null ? 0 : x);
+ int globaly = parenty + (parent == null ? 0 : y);
// intersect the x,y,w,h rendering window with ourselves; quit if it's empty
- int x = max(xIn, parent == null ? 0 : this.x);
- int y = max(yIn, parent == null ? 0 : this.y);
- int w = min(xIn + wIn, (parent == null ? 0 : this.x) + width) - x;
- int h = min(yIn + hIn, (parent == null ? 0 : this.y) + height) - y;
- if (w <= 0 || h <= 0) return;
+ clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
+ cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
+ clipx = max(clipx, parent == null ? 0 : globalx);
+ clipy = max(clipy, parent == null ? 0 : globaly);
+ if (clipw <= 0 || cliph <= 0) return;
if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null)
- buf.fillRect(x, y, x + w, y + h, (fillcolor & 0xFF000000) != 0 ? fillcolor : 0xFF777777);
+ buf.fillRect(clipx, clipy, clipx + clipw, clipy + cliph, (fillcolor & 0xFF000000) != 0 ? fillcolor : 0xFF777777);
if (image != null)
- if (tile) renderTiledImage(x, y, w, h, buf);
- else renderStretchedImage(x, y, w, h, buf);
+ if (tile) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ else renderStretchedImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
- if (text != null && !text.equals("")) renderText(x, y, w, h, buf);
+ //if (text != null && !text.equals("")) renderText(x, y, w, h, buf);
// now subtract the pad region from the clip region before proceeding
- int x2 = max(x, x + hpad);
- int y2 = max(y, y + vpad);
- int w2 = min(x + w, x + width - hpad) - x2;
- int h2 = min(y + h, y + height - vpad) - y2;
+ clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
+ cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
+ clipx = max(clipx, globalx + hpad);
+ clipy = max(clipy, globaly + vpad);
- for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(x2, y2, w2, h2, buf);
+ for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf);
}
- void renderStretchedImage(int x, int y, int w, int h, DoubleBuffer buf) {
+ void renderStretchedImage(int globalx, int globaly, int x, int y, int w, int h, DoubleBuffer buf) {
buf.setClip(x, y, w + x, h + y);
- int width = x + this.width - x;
- int height = y + this.height - y;
-
/*
if (fixedaspect) {
int hstretch = width / image.getWidth();
}
*/
- buf.drawPicture(image, x, y, x + width, y + height, 0, 0, image.getWidth(), image.getHeight());
+ buf.drawPicture(image, globalx, globaly, globalx + width, globaly + height, 0, 0, image.getWidth(), image.getHeight());
buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
}
- void renderTiledImage(int x, int y, int w, int h, DoubleBuffer buf) {
+ void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, DoubleBuffer buf) {
int iw = image.getWidth();
int ih = image.getHeight();
-
+ // FIXME broken
for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
for(int j=(y - y)/ih; j<= (y + h - y)/ih; j++) {
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 (!invisible && 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.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.invisible && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; }
+ globalx -= child.x;
+ globaly -= child.y;
}
break;
}
Log.log(this, "invalid color " + s);
return;
}
+ else if (SVG.colors.get(s) != null)
+ newcolor = 0xFF000000 | ((Integer)SVG.colors.get(s)).intValue();
// FIXME put named colors back in
if (newcolor == b.fillcolor) return;
b.fillcolor = newcolor;
});
//#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) {
return new Integer(b.x);
}
public void put(Box b, Object value) {
- b.x = stoi(value);
+ if (!b.absolute) 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.centerSurfaceOnRender = false;
}
+ MARK_FOR_REFLOW_b;
+ b.dirty();
}
});
//#end
boolean newabsolute = stob(value);
if (newabsolute == b.absolute) return;
b.absolute = newabsolute;
+ if (b.absolute) { b.x = 0; b.y = 0; }
if (b.parent != null) MARK_FOR_REFLOW_b_parent;
} });
} else {
b.minwidth = b.maxwidth = b.image.getWidth();
b.minheight = b.maxheight = b.image.getHeight();
+ MARK_FOR_REFLOW_b;
}
}
b.dirty();
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
//#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
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;
}
}
projects / org.ibex.core.git / commitdiff