X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=1e55cb8ebadac3997cc4e35fb27fa71654ff4812;hb=89152b4505ee3435af5396582e25ef45bd48f290;hp=f89e998acaa5653d977e421b5224067cab192a11;hpb=fbb46029a34ee12fbd5f8c834ef4c19914340fc7;p=org.ibex.core.git
diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index f89e998..1e55cb8 100644
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -122,63 +122,63 @@ public final class Box extends JSObject {
/** The maximum defined width and height of this box */
public static final int dmax = 0;
- private short _dmax_0 = 0;
- private short _dmax_1 = 0;
- public final short dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
+ private int _dmax_0 = 0;
+ private int _dmax_1 = 0;
+ public final int dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
/** The minimum defined width and height of this box */
public static final int dmin = 1;
- private short _dmin_0 = 0;
- private short _dmin_1 = 0;
- public final short dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
+ private int _dmin_0 = 0;
+ private int _dmin_1 = 0;
+ public final int dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
/** The minimum calculated width and height of this box -- unlike dmin, this takes childrens' sizes into account */
public static final int cmin = 2;
- private short _cmin_0 = 0;
- private short _cmin_1 = 0;
- public final short cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
+ private int _cmin_0 = 0;
+ private int _cmin_1 = 0;
+ public final int cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
/** The position of this box, relitave to the parent */
public static final int abs = 3;
- private short _abs_0 = 0;
- private short _abs_1 = 0;
- public final short abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
+ private int _abs_0 = 0;
+ private int _abs_1 = 0;
+ public final int abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
/** The absolute position of this box (ie relitave to the root); set by the parent */
public static final int pos = 4;
- private short _pos_0 = 0;
- private short _pos_1 = 0;
- public final short pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
+ private int _pos_0 = 0;
+ private int _pos_1 = 0;
+ public final int pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
/** The actual size of this box; set by the parent. */
public static final int size = 5;
- short _size_0 = 0;
- short _size_1 = 0;
- public final short size(int axis) { return axis == 0 ? _size_0 : _size_1; }
+ int _size_0 = 0;
+ int _size_1 = 0;
+ public final int size(int axis) { return axis == 0 ? _size_0 : _size_1; }
/** The old actual absolute position of this box (ie relitave to the root) */
public static final int oldpos = 6;
- private short _oldpos_0 = 0;
- private short _oldpos_1 = 0;
- public final short oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
+ private int _oldpos_0 = 0;
+ private int _oldpos_1 = 0;
+ public final int oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
/** The old actual size of this box */
public static final int oldsize = 7;
- private short _oldsize_0 = 0;
- private short _oldsize_1 = 0;
- public final short oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
+ private int _oldsize_0 = 0;
+ private int _oldsize_1 = 0;
+ public final int oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
/** The padding along each edge for this box */
public static final int pad = 8;
- private short _pad_0 = 0;
- private short _pad_1 = 0;
- public final short pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
+ private int _pad_0 = 0;
+ private int _pad_1 = 0;
+ public final int pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
/** The dimensions of the text in this box */
public static final int textdim = 9;
- private short _textdim_0 = 0;
- private short _textdim_1 = 0;
- public final short textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
+ private int _textdim_0 = 0;
+ private int _textdim_1 = 0;
+ public final int textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
// Instance Data /////////////////////////////////////////////////////////////////
@@ -189,8 +189,11 @@ public final class Box extends JSObject {
/** If redirect is enabled, this holds the Box redirected to */
Box redirect = this;
- /** the Box's font -- you must call textupdate() after changing this */
- String font = Platform.getDefaultFont();
+ /** the Box's font, null inherits from parent -- you must call textupdate() after changing this */
+ String font = null;
+
+ /** if font == null, this might be a cached copy of the inherited ancestor font */
+ String cachedFont = null;
/** The surface for us to render on; null if none; INVARIANT: surface == getParent().surface */
Surface surface = null;
@@ -285,8 +288,7 @@ public final class Box extends JSObject {
// Methods which enforce/preserve invariants ////////////////////////////////////////////
/** This method MUST be used to change geometry values -- it ensures that certain invariants are preserved. */
- public final void set(int which, int axis, int newvalue) { set(which, axis, (short)newvalue); }
- public final void set(int which, int axis, short newvalue) {
+ public final void set(int which, int axis, int newvalue) {
// if this Box is the root of the Surface, notify the Surface of size changes
if (getParent() == null && surface != null && which == size)
@@ -313,16 +315,11 @@ public final class Box extends JSObject {
if (which == dmin) set(size, axis, max(size(axis), newvalue));
if (which == dmax) set(size, axis, min(size(axis), newvalue));
- // keep obedience to shrink directives
- if (which == cmin || which == textdim || which == pad || which == dmin)
- if ((hshrink && axis == 0) || (vshrink && axis == 1))
- set(dmax, axis, max(cmin(axis), (textdim(axis) + 2 * pad(axis)), dmin(axis)));
-
// keep cmin in line with dmin/dmax/textdim
if (which == dmax || which == dmin || which == textdim || which == pad || which == cmin)
set(cmin, axis,
max(
- min(cmin(axis), dmax(axis)),
+ min(dmax(axis), cmin(axis)),
dmin(axis),
min(dmax(axis), textdim(axis) + 2 * pad(axis))
)
@@ -358,13 +355,13 @@ public final class Box extends JSObject {
/** Ensures that cmin is in sync with the cmin's of our children. This should be called whenever a child is added or
* removed, as well as when our pad is changed. */
final void sync_cmin_to_children() {
- short co = (short)(2 * pad(o));
- short cxo = (short)(2 * pad(xo));
+ int co = (int)(2 * pad(o));
+ int cxo = (int)(2 * pad(xo));
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible || bt.absolute) continue;
co += bt.cmin(o);
- cxo = (short)max(bt.cmin(xo) + 2 * pad(xo), cxo);
+ cxo = (int)max(bt.cmin(xo) + 2 * pad(xo), cxo);
}
set(cmin, o, co);
@@ -379,16 +376,34 @@ public final class Box extends JSObject {
set(dmin, 1, (image == null ? 0 : image.getHeight()) + (border == null ? 0 : border[0].getHeight()) * 2);
}
+ /** returns the actual font that should be used to render this box */
+ private String font() {
+ if (font != null) return font;
+ if (font == null && cachedFont != null) return cachedFont;
+ if (getParent() != null) return cachedFont = getParent().font();
+ return cachedFont = Platform.getDefaultFont();
+ }
+
+ /** this must be called when a box's font changes */
+ void fontChanged() {
+ textupdate();
+ for(Box b = getChild(0); b != null; b = b.nextSibling())
+ if (b.font == null) {
+ b.cachedFont = font();
+ b.fontChanged();
+ }
+ }
+
/** This must be called when font or text is changed */
void textupdate() {
if (text.equals("")) {
set(textdim, 0, 0);
set(textdim, 1, 0);
} else {
- XWF xwf = XWF.getXWF(font);
+ XWF xwf = XWF.getXWF(font());
if (xwf == null) {
- set(textdim, 0, Platform.stringWidth(font, text));
- set(textdim, 1, (Platform.getMaxAscent(font) + Platform.getMaxDescent(font)));
+ set(textdim, 0, Platform.stringWidth(font(), text));
+ set(textdim, 1, (Platform.getMaxAscent(font()) + Platform.getMaxDescent(font())));
} else {
set(textdim, 0, xwf.stringWidth(text));
set(textdim, 1, (xwf.getMaxAscent() + xwf.getMaxDescent()));
@@ -414,14 +429,14 @@ public final class Box extends JSObject {
/** loads the image described by string str, possibly blocking for a network load */
static ImageDecoder getImage(String str, final Function callback) {
- ImageDecoder ret = null;
- boolean ispng = false;
if (str.indexOf(':') == -1) {
String s = str;
byte[] b = Resources.getResource(Resources.resolve(s + ".png", null));
- if (b == null) return null;
- return PNG.decode(new ByteArrayInputStream(b), str);
+ if (b != null) return PNG.decode(new ByteArrayInputStream(b), str);
+ b = Resources.getResource(Resources.resolve(s + ".jpeg", null));
+ if (b != null) return Platform.decodeJPEG(new ByteArrayInputStream(b), str);
+ return null;
} else {
Thread thread = Thread.currentThread();
@@ -434,10 +449,6 @@ public final class Box extends JSObject {
mythread.setPriority(Thread.MIN_PRIORITY);
mythread.done.release();
try {
- // FIXME use mime types here, not extensions
- if (str.endsWith(".jpeg") || str.endsWith(".jpg"))
- str = "http://xmlrpc.xwt.org/jpeg2png/" + str.substring(str.indexOf("//") + 2);
-
HTTP http = new HTTP(str);
final HTTP.HTTPInputStream in = http.GET();
final int contentLength = in.getContentLength();
@@ -468,9 +479,10 @@ public final class Box extends JSObject {
return ret;
}
};
-
+
if (str.endsWith(".gif")) return GIF.decode(is, str);
- else return PNG.decode(is, str);
+ else if (str.endsWith(".jpeg") || str.endsWith(".jpg")) return Platform.decodeJPEG(is, str);
+ else return PNG.decode(is, str);
} catch (IOException e) {
if (Log.on) Log.log(Box.class, "error while trying to load an image from " + str);
@@ -511,7 +523,7 @@ public final class Box extends JSObject {
if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " +
Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
return;
- }
+ }
if (sizetoimage) syncSizeToImage();
dirty();
}
@@ -639,8 +651,8 @@ public final class Box extends JSObject {
/** creates a new box from an anonymous template; ids is passed through to Template.apply() */
Box(Template anonymous, Vec pboxes, Vec ptemplates, Function callback, int numerator, int denominator) {
super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
template = anonymous;
template.apply(this, pboxes, ptemplates, callback, numerator, denominator);
templatename = null;
@@ -651,8 +663,8 @@ public final class Box extends JSObject {
public Box(String templatename, String[] importlist) { this(templatename, importlist, null); }
public Box(String templatename, String[] importlist, Function callback) {
super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
this.importlist = importlist;
if (!"box".equals(templatename)) {
template = Template.getTemplate(templatename, importlist);
@@ -769,8 +781,8 @@ public final class Box extends JSObject {
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible) continue;
if (bt.absolute) {
- bt.set(size, o, max(bt.cmin(o), min(size(o) - bt.abs(o) - pad(o), bt.dmax(o))));
- bt.set(size, xo, max(bt.cmin(xo), min(size(xo) - bt.abs(xo) - pad(xo), bt.dmax(xo))));
+ bt.set(size, 0, bt.hshrink ? bt.cmin(0) : max(bt.cmin(0), min(size(0) - bt.abs(0) - pad(0), bt.dmax(0))));
+ bt.set(size, 1, bt.vshrink ? bt.cmin(1) : max(bt.cmin(1), min(size(1) - bt.abs(1) - pad(1), bt.dmax(1))));
} else if (xo == 0 && bt.hshrink || xo == 1 && bt.vshrink) {
bt.set(size, xo, bt.cmin(xo));
} else {
@@ -805,15 +817,16 @@ public final class Box extends JSObject {
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.absolute || bt.invisible) continue;
- bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, bt.dmax(o)));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, btmax));
total += bt.size(o);
if (factor * bt.flex < bt.cmin(o) && bt.size(o) == bt.cmin(o)) {
nextjoint = min(nextjoint, divide_round_up(bt.cmin(o), bt.flex));
- } else if (bt.size(o) < bt.dmax(o)) {
+ } else if (bt.size(o) < btmax) {
remaining_flex += bt.flex;
- nextjoint = min(nextjoint, divide_round_up(bt.dmax(o), bt.flex));
+ nextjoint = min(nextjoint, divide_round_up(btmax, bt.flex));
}
}
@@ -830,10 +843,11 @@ public final class Box extends JSObject {
// arbitrarily distribute out any leftovers resulting from rounding errors
int last = 0;
- while(goal > total && total != last) {
+ while(goal != total && total != last) {
last = total;
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
- int newsize = bound(bt.cmin(o), bt.size(o) + 1, bt.dmax(o));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), btmax);
total += newsize - bt.size(o);
bt.set(size, o, newsize);
}
@@ -881,7 +895,6 @@ public final class Box extends JSObject {
int y1 = max(y, pos(1) + bh);
int x2 = min(x + w, pos(0) + size(0) - bw);
int y2 = min(y + h, pos(1) + size(1) - bh);
- buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
if (y2 - y1 > 0 && x2 - x1 > 0)
buf.fillRect(x1,y1,x2,y2,(color & 0xFF000000) != 0 ? color : SpecialBoxProperty.lightGray);
}
@@ -1022,34 +1035,34 @@ public final class Box extends JSObject {
if ((textcolor & 0xFF000000) == 0x00000000) return;
buf.setClip(x, y, w + x, h + y);
- XWF xwf = XWF.getXWF(font);
+ XWF xwf = XWF.getXWF(font());
if (xwf != null) {
xwf.drawString(buf, text,
pos(0) + pad(0),
pos(1) + pad(1) + xwf.getMaxAscent() - 1,
textcolor);
} else {
- buf.drawString(font, text,
+ buf.drawString(font(), text,
pos(0) + pad(0),
- pos(1) + pad(1) + Platform.getMaxAscent(font) - 1,
+ pos(1) + pad(1) + Platform.getMaxAscent(font()) - 1,
textcolor);
}
buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
- int i=0; while(i i) {
+ if (font().lastIndexOf('d') > i) {
for(int j = pos(0) + pad(0); j < pos(0) + pad(0) + textdim(0); j += 2)
- buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
- j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
+ buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
+ j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
textcolor);
- } else if (font.lastIndexOf('u') > i) {
+ } else if (font().lastIndexOf('u') > i) {
buf.fillRect(pos(0) + pad(0),
- pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
+ pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
pos(0) + pad(0) + textdim(0),
- pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
+ pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
textcolor);
}
@@ -1099,6 +1112,16 @@ public final class Box extends JSObject {
} else {
Box newnode = (Box)value;
+
+ // check if box being moved is currently target of a redirect
+ for(Box cur = newnode.getParent(); cur != null; cur = cur.getParent())
+ if (cur.redirect == newnode) {
+ if (Log.on) Log.log(this, "attempt to move a box that is the target of a redirect at "+
+ Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ return;
+ }
+
+ // check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.getParent())
if (cur == newnode) {
if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " +
@@ -1107,7 +1130,7 @@ public final class Box extends JSObject {
}
if (numKids > 15 && children == null) convert_to_array();
- if (newnode.parent != null) newnode.remove();
+ newnode.remove();
newnode.parent = this;
if (children == null) {
@@ -1314,8 +1337,9 @@ public final class Box extends JSObject {
/** remove this node from its parent; INVARIANT: whenever the parent of a node is changed, remove() gets called. */
public void remove() {
+ cachedFont = null;
if (parent == null) {
- if (surface != null) surface.dispose();
+ if (surface != null) surface.dispose(true);
return;
}
Box oldparent = getParent();