static final int ALIGN_RIGHT = 0x00008000;
static final int ALIGNS = 0x0000f000;
static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues?
- static final int NOCLIP = 0x00020000;
+ static final int CLIP = 0x00020000;
static final int STOP_UPWARD_PROPAGATION = 0x00040000;
Box parent = null;
Box redirect = this;
- int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION;
+ int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP;
private String text = null;
private Font font = DEFAULT_FONT;
private Picture texture = null;
private short strokewidth = 1;
- private int fillcolor = 0x00000000;
+ public int fillcolor = 0x00000000;
private int strokecolor = 0xFF000000;
+ private int aspect = 0;
+
// specified directly by user
public LENGTH minwidth = 0;
public LENGTH maxwidth = MAX_LENGTH;
/** invoked when a resource needed to render ourselves finishes loading */
public void perform() throws JSExn {
+
+ // FIXME; we can't assume that just because we were performed the image is loaded.
// as external events have occured, check the state of box
if (texture != null) {
- if (texture.isLoaded) { minwidth = texture.width; minheight = texture.height; }
- else { Res res = texture.res; texture = null; throw new JSExn("image not found: "+res); }
+ if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); }
+ else { Res res = texture.res; texture = null; throw new JSExn("image not found: "+res); }
}
MARK_REPACK;
public void dirty() { dirty(0, 0, width, height); }
public void dirty(int x, int y, int w, int h) {
for(Box cur = this; cur != null; cur = cur.parent) {
- if (!cur.test(NOCLIP)) {
+ // x and y have a different meaning on the root box
+ if (cur.parent != null && cur.test(CLIP)) {
w = min(x + w, cur.width) - max(x, 0);
h = min(y + h, cur.height) - max(y, 0);
x = max(x, 0);
}
void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
- // FEATURE reimplement, but we're destroying this
- // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345
- //if (x != this.x || y != this.y || width != this.width || height != this.height) {
- (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
+ if (x != this.x || y != this.y || width != this.width || height != this.height) {
boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
+ do {
+ int thisx = parent == null ? 0 : this.x;
+ int thisy = parent == null ? 0 : this.y;
+ if (texture == null && (text == null || text.equals(""))) {
+ if ((fillcolor & 0xff000000) == 0) break;
+ // FEATURE: more optimizations here
+ if (this.x == x && this.y == y) {
+ Box who = (parent == null ? this : parent);
+ who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height));
+ who.dirty(thisx, thisy+min(this.height,height), min(this.width, width), Math.abs(height-this.height));
+ break;
+ }
+ }
+ (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
+ this.width = width; this.height = height; this.x = x; this.y = y;
+ dirty();
+ } while (false);
this.width = width; this.height = height; this.x = x; this.y = y;
- dirty();
if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T);
- //}
+ }
}
void resize_children() {
int globaly = parenty + (parent == null ? 0 : y);
// intersect the x,y,w,h rendering window with ourselves; quit if it's empty
- if (!test(NOCLIP)) {
+
+ if (test(CLIP)) {
cx1 = max(cx1, parent == null ? 0 : globalx);
cy1 = max(cy1, parent == null ? 0 : globaly);
cx2 = min(cx2, globalx + width);
}
if ((fillcolor & 0xFF000000) != 0x00000000)
- buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor);
+ buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, fillcolor);
+ // FIXME: do aspect in here
if (texture != null && texture.isLoaded)
for(int x = globalx; x < cx2; x += texture.width)
for(int y = globaly; y < cy2; y += texture.height)
return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name);
//#switch(name)
+ case "surface": return parent == null ? null : parent.get("surface");
case "indexof": return METHOD;
case "text": return text;
case "path": throw new JSExn("cannot read from the path property");
case "shrink": return B(test(HSHRINK) || test(VSHRINK));
case "hshrink": return B(test(HSHRINK));
case "vshrink": return B(test(VSHRINK));
+ case "aspect": return N(aspect);
case "x": return (parent == null || !test(VISIBLE)) ? N(0) : N(x);
case "y": return (parent == null || !test(VISIBLE)) ? N(0) : N(y);
case "width": return N(width);
case "rows": return test(FIXED) == ROWS ? N(rows) : N(0);
case "colspan": return N(colspan);
case "rowspan": return N(rowspan);
- case "noclip": return B(test(NOCLIP));
+ case "clip": return B(test(CLIP));
case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T)));
case "packed": return B(test(PACKED));
case "globalx": return N(localToGlobalX(0));
case "globaly": return N(localToGlobalY(0));
case "cursor": return test(CURSOR) ? boxToCursor.get(this) : null;
- case "mousex": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalX(s.mousex)); }
- case "mousey": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalY(s.mousey)); }
- case "mouseinside": return B(test(MOUSEINSIDE));
+ case "mouse":
+ if (getSurface() == null) return null;
+ if (getSurface()._mousex == Integer.MAX_VALUE)
+ throw new JSExn("you cannot read from the box.mouse property in background thread context");
+ return new Mouse();
case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren");
case "minwidth": return N(minwidth);
case "maxwidth": return N(maxwidth);
throw new Error("unreachable"); // unreachable
}
- void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); }
- void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); }
+ private class Mouse extends JS {
+ public Object get(Object key) {
+ //#switch(key)
+ case "x": return N(globalToLocalX(getSurface()._mousex));
+ case "y": return N(globalToLocalY(getSurface()._mousey));
+
+ // this might not get recomputed if we change mousex/mousey...
+ case "inside": return B(MOUSEINSIDE);
+ //#end
+ return null;
+ }
+ }
+
+ void setMaxWidth(Object value) {
+ do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false);
+ if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth;
+ }
+ void setMaxHeight(Object value) {
+ do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false);
+ if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight;
+ }
public void put(Object name, Object value) throws JSExn {
if (name instanceof Number) { put(toInt(name), value); return; }
case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent;
case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK;
case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK;
- case "noclip": CHECKSET_FLAG(NOCLIP); if (parent == null) dirty(); else parent.dirty();
+ case "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty();
case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty();
case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent;
+ case "aspect": CHECKSET_INT(aspect); dirty();
case "globalx": put("x", N(globalToLocalX(toInt(value))));
case "globaly": put("y", N(globalToLocalY(toInt(value))));
case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); MARK_RESIZE;
case "cursor": setCursor(value);
case "fill": setFill(value);
+ case "mouse":
+ int mousex = toInt(((JS)value).get("x"));
+ int mousey = toInt(((JS)value).get("y"));
+ getSurface()._mousex = localToGlobalX(mousex);
+ getSurface()._mousey = localToGlobalY(mousey);
case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value); // FEATURE
case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE
case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true);
return;
}
if (!(value instanceof Res)) return;
-
texture = Picture.load((Res)value, this);
}
+ // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down
/**
* Handles events which propagate down the box tree. If obscured
* is set, then we merely check for Enter/Leave.
String name = (String)name_;
if (getSurface() == null) return;
- int x = globalToLocalX(getSurface().mousex);
- int y = globalToLocalY(getSurface().mousey);
+ int x = globalToLocalX(getSurface()._mousex);
+ int y = globalToLocalY(getSurface()._mousey);
boolean wasinside = test(MOUSEINSIDE);
boolean isinside = test(VISIBLE) && inside(x, y) && !obscured;
if (!wasinside && isinside) { set(MOUSEINSIDE); putAndTriggerTrapsAndCatchExceptions("Enter", T); }
}
private static int stringToColor(String s) {
+ // FIXME support three-char strings by doubling digits
if (s == null) return 0x00000000;
else if (SVG.colors.get(s) != null) return 0xFF000000 | toInt(SVG.colors.get(s));
else if (s.length() > 0 && s.charAt(0) == '#') try {
projects / org.ibex.core.git / blobdiff