@@ -82,7 +82,7 @@ import org.mozilla.javascript.*; * uses x1,y1,x2,y2 tuples. *
*/ -public final class Box extends JSObject { +public final class Box extends JS.Scope { // Static Data ////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ public final class Box extends JSObject { static Hash imageToNameMap = new Hash(); /** the empty object, used for get-traps */ - private static Object[] emptyobj = new Object[] { }; + private static JS.Array emptyobj = new JS.Array(); // Instance Data: Templates //////////////////////////////////////////////////////// @@ -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; @@ -260,22 +263,18 @@ public final class Box extends JSObject { // Instance Data: IndexOf //////////////////////////////////////////////////////////// /** The indexof() Function; created lazily */ - public Function indexof = null; - public Function indexof() { - if (indexof == null) indexof = new IndexOf(); - return indexof; - } + public JS.Callable indexof = null; + public JS.Callable indexof() { if (indexof == null) indexof = new IndexOf(); return indexof; } /** a trivial private class to serve as the box.indexof function object */ - private class IndexOf extends JSObject implements Function { + private class IndexOf extends JS.Callable { public IndexOf() { this.setSeal(true); } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - public Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException { - if (args == null || args.length != 1 || args[0] == null || !(args[0] instanceof Box)) return new Integer(-1); - Box b = (Box)args[0]; + public Object call(JS.Array args) throws JS.Exn { + if (args.length() != 1 || args.elementAt(0) == null || !(args.elementAt(0) instanceof Box)) return new Integer(-1); + Box b = (Box)args.elementAt(0); if (b.getParent() != Box.this) { if (redirect == null || redirect == Box.this) return new Integer(-1); - return Box.this.redirect.indexof().call(cx, scope, thisObj, args); + return Box.this.redirect.indexof().call(args); } return new Integer(b.getIndexInParent()); } @@ -373,16 +372,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())); @@ -407,30 +424,27 @@ 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) { - boolean ispng = false; + static ImageDecoder getImage(String str, final JS.Callable callback) { 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(); + java.lang.Thread thread = java.lang.Thread.currentThread(); if (!(thread instanceof ThreadMessage)) { 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.setPriority(java.lang.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(); @@ -446,11 +460,13 @@ public final class Box extends JSObject { 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 { + ThreadMessage.newthread(new JS.Callable() { + public Object call(JS.Array args_) throws JS.Exn { try { - callback.call(cx, null, null, new Object[] { - new Double(bytesDownloaded), new Double(contentLength) }); + JS.Array args = new JS.Array(); + args.addElement(new Double(bytesDownloaded)); + args.addElement(new Double(contentLength)); + callback.call(args); } finally { clear = true; } @@ -461,8 +477,9 @@ public final class Box extends JSObject { return ret; } }; - + if (str.endsWith(".gif")) return GIF.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) { @@ -472,7 +489,7 @@ public final class Box extends JSObject { } finally { MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); + mythread.setPriority(java.lang.Thread.NORM_PRIORITY); mythread.go.block(); } } @@ -501,8 +518,7 @@ public final class Box extends JSObject { } else { image = getPicture(s); if (image == null) { - if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " + - Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine); + if (Log.on) Log.logJS(Box.class, "unable to load image " + s); return; } if (sizetoimage) syncSizeToImage(); @@ -523,8 +539,7 @@ public final class Box extends JSObject { if (border == null) { 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); + if (Log.on) Log.logJS(this, "unable to load border image " + s); return; } int[] data = id.getData(); @@ -569,21 +584,10 @@ public final class Box extends JSObject { } /** returns true if the property has a trap on it */ - boolean is_trapped(String property) { - if (traps == null) { - return false; - } else { - Object gc = traps.get(property); - return (gc != null && - !(gc instanceof org.mozilla.javascript.Undefined) && - gc != org.mozilla.javascript.Scriptable.NOT_FOUND); - } - } + boolean is_trapped(String property) { return traps != null && traps.get(property) != null; } /** Adds the node's current actual geometry to the Surface's dirty list */ - void dirty() { - dirty(pos(0), pos(1), size(0), size(1)); - } + void dirty() { dirty(pos(0), pos(1), size(0), size(1)); } /** 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(int x, int y, int w, int h) { @@ -613,9 +617,9 @@ public final class Box extends JSObject { if (!wasinside && !isinside) return; - if (!wasinside && isinside && is_trapped("Enter")) put("Enter", null, this); - else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", null, this); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", null, this); + if (!wasinside && isinside && is_trapped("Enter")) put("Enter", this); + else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", this); + else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", this); if (isinside && cursor != null && surface != null) surface.cursor = cursor; @@ -630,8 +634,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); + Box(Template anonymous, Vec pboxes, Vec ptemplates, JS.Callable callback, int numerator, int denominator) { + super(null); set(dmax, 0, Integer.MAX_VALUE); set(dmax, 1, Integer.MAX_VALUE); template = anonymous; @@ -642,8 +646,8 @@ public final class Box extends JSObject { /** creates a new box from an unresolved templatename and an importlist; use "box" for an untemplatized box */ public Box(String templatename, String[] importlist) { this(templatename, importlist, null); } - public Box(String templatename, String[] importlist, Function callback) { - super(true); + public Box(String templatename, String[] importlist, JS.Callable callback) { + super(null); set(dmax, 0, Integer.MAX_VALUE); set(dmax, 1, Integer.MAX_VALUE); this.importlist = importlist; @@ -707,12 +711,12 @@ public final class Box extends JSObject { 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), pos(1), - Math.abs(oldsize(0) - size(0)) + bw, + java.lang.Math.abs(oldsize(0) - size(0)) + bw, max(oldsize(1), size(1))); cur.dirty(pos(0), pos(1) + min(oldsize(1) - bh, size(1) - bh), max(oldsize(0), size(0)), - Math.abs(oldsize(1) - size(1)) + bh); + java.lang.Math.abs(oldsize(1) - size(1)) + bh); } // SLOWPATH: dirty ourselves, as well as our former position on our parent @@ -736,17 +740,18 @@ public final class Box extends JSObject { 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); + if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render"); + /* try { Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange"); - InterpretedFunction f = (InterpretedFunction)t.f; + InterpretedJS.Callable f = (InterpretedJS.Callable)t.f; if (Log.on) Log.log(this, "Current trap is at " + f.getSourceName() + ":" + f.getLineNumbers()[0]); } catch (Throwable t) { } + */ } } else { - if (sizechange) put("SizeChange", null, Boolean.TRUE); - if (poschange) put("PosChange", null, Boolean.TRUE); + if (sizechange) put("SizeChange", Boolean.TRUE); + if (poschange) put("PosChange", Boolean.TRUE); if (sizechange || poschange) { surface.abort = true; return; @@ -1016,34 +1021,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