// RULE: coordinates on non-static methods are ALWAYS relative to the
// upper-left hand corner of <tt>this</tt>
+// 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
import java.util.*;
import org.xwt.js.*;
import org.xwt.util.*;
+import org.xwt.translators.*;
/**
* <p>
* 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 {
//#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
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;
// 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;
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);
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);
}
/**
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;
/** 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 = minwidth; contentheight = minheight; 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) {
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
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());
}
}
}
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<numCols; col++) contentwidth += colWidth[col];
contentwidth = max(textwidth + 2 * hpad, contentwidth);
//#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 numCols/numRows
+ if (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)) 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_FLAG/VSHRINK_FLAG numCols/numRows
colWidth[child.col] = max(colWidth[child.col], child.contentwidth / 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);
+ colMaxWidth[i] = max(colMaxWidth[i], (((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : child.maxwidth) / child.colspan);
//#end
}
// --- 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 numCols/numRows
- slack = width;
+ //#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
+ slack = width - 2 * hpad;
for(int i=0; i<numCols; i++) slack -= colWidth[i];
if (numChildren() > 0)
while(slack > 0) {
// --- Phase 4 ----------------------------------------------------------------------
// assign children's new sizes and positions and recurse
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
- if (child.invisible) continue;
+ if ((child.flags & INVISIBLE_FLAG) != 0) continue;
int child_x = 0, child_y = 0, child_width = 0, child_height = 0;
- if (child.absolute) {
+ if ((child.flags & ABSOLUTE_FLAG) != 0) {
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);
+ child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x - hpad);
+ child_height = ((child.flags & VSHRINK_FLAG) != 0) ? 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
+ //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG 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;
+ diff = bound(child.contentwidth, child_width, ((child.flags & HSHRINK_FLAG) != 0) ? 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;
// Rendering Pipeline /////////////////////////////////////////////////////////////////////
/** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
- void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
- if (Surface.abort || invisible) return;
+ void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
+ if (Surface.abort || (flags & INVISIBLE_FLAG) != 0) 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
- 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;
+ 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(clipx, clipy, clipx + clipw, clipy + cliph, (fillcolor & 0xFF000000) != 0 ? fillcolor : 0xFF777777);
+ buf.fillRect(clipx, clipy, clipx + clipw, clipy + cliph,
+ (fillcolor & 0xFF000000) != 0 ? fillcolor : 0xFF777777);
if (image != null)
- if (tile) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ if ((flags & TILE_FLAG) != 0) 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(globalx, globaly, clipx, clipy, clipw, cliph, buf);
// now subtract the pad region from the clip region before proceeding
clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
clipx = max(clipx, globalx + hpad);
clipy = max(clipy, globaly + vpad);
- for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ for(Box b = getChild(0); b != null; b = b.nextSibling())
+ b.render(globalx, globaly, clipx, clipy, clipw, cliph, 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);
-
- /*
- if (fixedaspect) {
- int hstretch = width / image.getWidth();
- if (hstretch == 0) hstretch = -1 * image.getWidth() / width;
- int vstretch = height / image.getHeight();
- if (vstretch == 0) vstretch = -1 * image.getHeight() / height;
- if (hstretch < vstretch) height = image.getHeight() * width / image.getWidth();
- else width = image.getWidth() * height / 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 renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
+ //buf.setClip(x, y, w + x, h + y);
+ System.out.println("draw " + clipx + " " + clipy + " " + (clipx + clipw) + " " + (clipy + cliph));
+ buf.drawPicture(image,
+ clipx, clipy, clipx + clipw, clipy + cliph,
+ 0, 0, image.getWidth(), image.getHeight());
+ //buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
}
- void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, DoubleBuffer buf) {
+ void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, PixelBuffer 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++) {
}
}
- void renderText(int x, int y, int w, int h, DoubleBuffer buf) {
- /*
- if ((textcolor & 0xFF000000) == 0x00000000) return;
- buf.setClip(x, y, w + x, h + y);
-
- buf.drawString(font(), text, x + hpad, y + vpad + Platform.getMaxAscent(font()) - 1, textcolor);
- buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
- int i=0; while(i<font().length() && !Character.isDigit(font().charAt(i))) i++;
-
- if (font().lastIndexOf('d') > 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, PixelBuffer buf) {
+ for(int i=0; i<text.length(); i++) {
+ // FIXME: clipping
+ char c = text.charAt(i);
+ Glyph g = Glyph.getGlyph(font, fontsize, c);
+ System.out.println("rendering glyph for " + c + " as " + g + " @ " + (x+hpad) + ", " + (y+vpad));
+ buf.drawPicture(g.p,
+ x + hpad,
+ y + vpad + g.max_ascent - g.baseline,
+ x + hpad + g.p.getWidth(),
+ y + vpad + g.max_ascent - g.baseline + g.p.getHeight(),
+ 0, 0,
+ g.p.getWidth(), g.p.getHeight());
+ x += g.advance;
}
- */
}
} else if ("apply".equals(method)) {
if (checkOnly) return Boolean.TRUE;
- if (args.elementAt(0) instanceof String) {
+ if (args.elementAt(0) instanceof Res) {
+ try {
+ Res res = (Res)args.elementAt(0);
+ // res = res.addExtension(".xwt");
+ Template t = Template.buildTemplate(res.getInputStream(), "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();
+ }
+ } catch (IOException e) {
+ Log.log(this, e);
+ }
+ } else if (args.elementAt(0) instanceof String) {
String templatename = (String)args.elementAt(0);
Template t = Template.getTemplate(templatename, null);
if (t == null) {
}
}
+ 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());
* @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) {
if (oldparent == null) return;
MARK_FOR_REFLOW_this;
dirty();
- mouseinside = false;
+ flags &= ~MOUSEINSIDE_FLAG;
if (parent.children != null) {
parent.children.removeElementAt(indexInParent);
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);
+ }
}
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) {
// 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--) {
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;
}
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
+ else if (org.xwt.translators.SVG.colors.get(s) != null)
+ newcolor = 0xFF000000 | ((Integer)org.xwt.translators.SVG.colors.get(s)).intValue();
if (newcolor == b.fillcolor) return;
b.fillcolor = newcolor;
b.dirty();
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); }
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 {
+ MARK_FOR_REFLOW_b;
+ b.textwidth = 0;
+ for(int i=0; i<b.text.length(); i++) {
+ Glyph g = Glyph.getGlyph(b.font, b.fontsize, b.text.charAt(i));
+ b.textwidth += g.advance;
+ b.textheight = g.max_ascent + g.max_descent;
+ }
+ } 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 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("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";
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; }
});
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;
}
});
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) {
- if (!b.absolute) return;
+ 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;
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;
}
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;
//#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;
}});
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 (b.absolute) { b.x = 0; b.y = 0; }
+ 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;
} });
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;
}
}
});
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() {
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();
}
}
});
// 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());
}
});
- /*
- // 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; }
- }
}
projects / org.ibex.core.git / blobdiff