/** If true, the Box will force its own size to the natural size of its background image */
boolean sizetoimage = false;
+ /** If true and tile is false, the background of this image will never be stretched */
+ boolean fixedaspect = false;
+
/** If true, the box will shrink to the smallest vertical size possible */
boolean vshrink = false;
}
/** loads the image described by string str, possibly blocking for a network load */
- private static ImageDecoder getImage(String str) {
+ static ImageDecoder getImage(String str, final Function callback) {
ImageDecoder ret = null;
boolean ispng = false;
if (Log.on) Log.log(Box.class, "HTTP images can not be loaded from the foreground thread");
return null;
}
+ // FIXME: use primitives here
ThreadMessage mythread = (ThreadMessage)thread;
mythread.setPriority(Thread.MIN_PRIORITY);
mythread.done.release();
try {
- if (str.endsWith(".png")) ret = PNG.decode(Platform.urlToInputStream(new URL(str)), str);
- else ret = GIF.decode(Platform.urlToInputStream(new URL(str)), str);
+ // 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);
+
+ final HTTP http = new HTTP(str);
+ final int contentLength = http.getContentLength();
+ InputStream is = new FilterInputStream(http.getInputStream()) {
+ int bytesDownloaded = 0;
+ boolean clear = true;
+ public int read() throws IOException {
+ bytesDownloaded++;
+ return super.read();
+ }
+ public int read(byte[] b, int off, int len) throws IOException {
+ int ret = super.read(b, off, len);
+ if (ret != -1) bytesDownloaded += ret;
+ if (clear && callback != null) {
+ clear = false;
+ ThreadMessage.newthread(new JSObject.JSFunction() {
+ public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+ try {
+ callback.call(cx, null, null, new Object[] {
+ new Double(bytesDownloaded), new Double(contentLength) });
+ } finally {
+ clear = true;
+ }
+ return null;
+ }
+ });
+ }
+ return ret;
+ }
+ };
+
+ if (str.endsWith(".gif")) ret = GIF.decode(is, str);
+ else ret = PNG.decode(is, str);
return ret;
} catch (IOException e) {
Picture ret = null;
ret = (Picture)pictureCache.get(os);
if (ret != null) return ret;
- ImageDecoder id = getImage(os);
+ ImageDecoder id = getImage(os, null);
if (id == null) return null;
ret = Platform.createPicture(id);
pictureCache.put(os, ret);
} else {
border = (Picture[])bordercache.get(s);
if (border == null) {
- ImageDecoder id = getImage(s);
+ ImageDecoder id = getImage(s, null);
if (id == null) {
if (Log.on) Log.log(this, "unable to load border image " + s + " at " +
Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
}
/** creates a new box from an anonymous template; <tt>ids</tt> is passed through to Template.apply() */
- Box(Template anonymous, Vec pboxes, Vec ptemplates) {
+ 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);
template = anonymous;
- template.apply(this, pboxes, ptemplates);
+ template.apply(this, pboxes, ptemplates, callback, numerator, denominator);
templatename = null;
importlist = null;
}
/** creates a new box from an unresolved templatename and an importlist; use "box" for an untemplatized box */
- public Box(String templatename, String[] importlist) {
+ 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);
this.importlist = importlist;
- template = "box".equals(templatename) ? null : Template.getTemplate(templatename, importlist);
- this.templatename = templatename;
+ if (!"box".equals(templatename)) {
+ template = Template.getTemplate(templatename, importlist);
+ if (template == null)
+ if (Log.on) Log.log(this, "couldn't find template \"" + templatename + "\"");
+ }
if (template != null) {
- template.apply(this, null, null);
+ this.templatename = templatename;
+ template.apply(this, null, null, callback, 0, template.numUnits());
if (redirect == this && !"self".equals(template.redirect)) redirect = null;
}
}
/** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */
void prerender() {
+ if (invisible) return;
+
if (getParent() == null) {
set(pos, 0, 0);
set(pos, 1, 0);
// FASTPATH: if we haven't moved position (just changed size), and we're not a stretched image:
if (oldpos(0) == pos(0) && oldpos(1) == pos(1) && (image == null || tile)) {
-
- int bw = border == null ? 0 : border[2].getWidth();
- int bh = border == null ? 0 : border[0].getHeight();
-
+
+ // we use the max(border, pad) since because of the pad we might be revealing an abs-pos child
+ int bw = max(border == null ? 0 : border[2].getWidth(), pad(0));
+ int bh = max(border == null ? 0 : border[0].getHeight(), pad(1));
+
// dirty only the *change* in the area we cover, both on ourselves and on our parent
for(Box cur = this; cur != null && (cur == this || cur == this.getParent()); cur = cur.getParent()) {
cur.dirty(pos(0) + min(oldsize(0) - bw, size(0) - bw),
set(oldpos, 0, pos(0));
set(oldpos, 1, pos(1));
- if (sizechange || poschange)
- if (surface.sizePosChangesSinceLastRender++ > 500) {
+ if (!sizechange && !poschange) return;
+
+ if (++surface.sizePosChangesSinceLastRender >= 500) {
+ if (surface.sizePosChangesSinceLastRender == 500) {
if (Log.on) Log.log(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render");
if (Log.on) Log.log(this, " interpreter is at " + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
try {
if (Log.on) Log.log(this, "Current trap is at " + f.getSourceName() + ":" + f.getLineNumbers()[0]);
} catch (Throwable t) { }
}
-
- if (sizechange) put("SizeChange", null, Boolean.TRUE);
- if (poschange) put("PosChange", null, Boolean.TRUE);
- if (sizechange || poschange) {
- surface.abort = true;
- return;
+ } else {
+ if (sizechange) put("SizeChange", null, Boolean.TRUE);
+ if (poschange) put("PosChange", null, Boolean.TRUE);
+ if (sizechange || poschange) {
+ surface.abort = true;
+ return;
+ }
}
}
int x1 = max(x, pos(0) + bw);
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) - 2);
+ 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);
buf.setClip(x, y, w + x, h + y);
if ((color & 0xFF000000) != 0xFF000000) {
-
// if the color is null, we have to be very careful about drawing the corners
//if (Log.verbose) Log.log(this, "WARNING: (color == null && border != null) on box with border " + imageToNameMap.get(border[4]));
buf.setClip(x, y, w + x, h + y);
int bw = border == null ? 0 : border[4].getHeight();
int bh = border == null ? 0 : border[4].getWidth();
+
+ int width = pos(0) + size(0) - bw / 2 - pos(0) + bw / 2;
+ int height = pos(1) + size(1) - bh / 2 - pos(1) + bh / 2;
+
+ 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,
pos(0) + bw / 2,
pos(1) + bh / 2,
- pos(0) + size(0) - bw / 2,
- pos(1) + size(1) - bh / 2,
+ pos(0) + bw / 2 + width,
+ pos(1) + bh / 2 + height,
0, 0, image.getWidth(), image.getHeight());
buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
}
return;
}
Box newnode = (Box)value;
+
+ 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 " +
+ Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ return;
+ }
+
if (redirect == null) {
if (Log.on) Log.log(this, "attempt to add a child to a node with a null redirect at " +
Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
if (gph != null) return gph.get(this);
- return super.get(name, start);
+ Object ret = super.get(name, start);
+ if (name.startsWith("$") && ret == null)
+ if (Log.on) Log.log(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found; " +
+ Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ return ret;
}
/** indicate that we don't want JSObject trying to handle these */
/** returns numerator/denominator, but rounds <i>up</i> instead of down */
static final int divide_round_up(int numerator, int denominator) {
+
+ // cope with bozos who use flex==0.0
+ if (denominator == 0) return Integer.MAX_VALUE;
+
int ret = numerator / denominator;
if (ret * denominator < numerator) return ret + 1;
return ret;
projects / org.ibex.core.git / blobdiff