static {
Font f = null;
try { f = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); }
- catch(JSExn e) { Log.log(Box.class, "should never happen: "+e); }
+ catch(JSExn e) { Log.info(Box.class, "should never happen: "+e); }
DEFAULT_FONT = f;
}
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;
/** 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) {
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(min(this.x+this.width,x+width), y, Math.abs(width-this.width), max(this.height, height));
- who.dirty(x, min(this.y+this.height,y+height), max(this.width, width), Math.abs(height-this.height));
+ 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(this.x, this.y, this.width, this.height);
+ (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);
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 (cx2 <= cx1 || cy2 <= cy1) return;
}
- if ((fillcolor & 0xFF000000) != 0x00000000)
- buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, fillcolor);
+ if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null)
+ buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : fillcolor);
// FIXME: do aspect in here
if (texture != null && texture.isLoaded)
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 "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));
}
}
- void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); }
- void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); }
+ 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 "Close": if (parent == null && getSurface() != null) getSurface().dispose(true);
case "toback": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toBack(); }
case "tofront": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toFront(); }
- case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once");
+ case "redirect": if (redirect == this) redirect = (Box)value; else Log.info(this, "redirect can only be set once");
case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty();
case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
case "bottom": set(ALIGN_BOTTOM);
case "left": set(ALIGN_LEFT);
case "right": set(ALIGN_RIGHT);
- default: Log.logJS("invalid alignment \"" + value + "\"");
+ default: JS.log("invalid alignment \"" + value + "\"");
//#end
}
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.
(Integer.parseInt(s.substring(3, 5), 16) << 8) |
Integer.parseInt(s.substring(5, 7), 16);
} catch (NumberFormatException e) {
- Log.log(Box.class, "invalid color " + s);
+ Log.info(Box.class, "invalid color " + s);
return 0;
}
else return 0; // FEATURE: error?
if (i < 0) return;
if (value != null && !(value instanceof Box)) {
- if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+ if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box");
return;
}
if (redirect == null) {
if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
- else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+ else JS.log(this, "attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
// check if box being moved is currently target of a redirect
for(Box cur = b.parent; cur != null; cur = cur.parent)
if (cur.redirect == b) {
- if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+ if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect");
return;
}
// check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.parent)
if (cur == b) {
- if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
- if (Log.on) Log.log(this, "box == " + this + " ancestor == " + b);
+ if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor");
+ if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b);
return;
}
try {
putAndTriggerTraps(name, val);
} catch (Exception e) {
- Log.logJS("caught exception while putting to trap \""+name+"\"");
- Log.logJS(e);
+ JS.log("caught exception while putting to trap \""+name+"\"");
+ JS.log(e);
}
}
projects / org.ibex.core.git / blobdiff