str = str.substring(str.indexOf('.') + 1);
ret = (JS)ret.get(path);
}
- ret = (JS)ret.get(str);
+ if (!"".equals(str)) ret = (JS)ret.get(str);
return ret;
}
case "ui": return getSub("ui");
case "ui.font": return getSub("ui.font");
case "ui.font.wait": return METHOD;
+ case "ui.font.width": return METHOD;
+ case "ui.font.height": return METHOD;
case "ui.font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf");
case "ui.font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf");
case "ui.font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf");
//#end
case 3:
//#switch(name)
- case "font.wait":
- try {
- JS.UnpauseCallback callback = JS.pause();
- Font font = Font.getFont((Stream)a, JS.toInt(b));
- if (font.rasterizeGlyphs((String)c, null, 0,0,0,0,0,0,0, callback) != -1) Scheduler.add(callback);
- } catch (JS.NotPauseableException npe) {
- JS.error("can't wait for a font in a foreground thread");
- }
+ case "ui.font.height": return N(Font.getFont((Stream)a, JS.toInt(b)).textheight((String)c));
+ case "ui.font.wait": throw new Error("FIXME: ibex.ui.font.wait not implemented");
+ case "ui.font.width": return N(Font.getFont((Stream)a, JS.toInt(b)).textwidth((String)c));
//#end
break;
}
throw new JSExn("invalid argument for ibex object method "+name+"()");
}
- throw new JSExn("invalid number of arguments for ibex object method "+name+"()");
+ throw new JSExn("invalid number of arguments ("+nargs+") for ibex object method "+name+"()");
}
public Stream url2res(String url) throws JSExn {
public static class Blessing extends JS.Clone {
private Ibex ibex;
private Template t = null;
- private Object parentkey = null;
- private Blessing parent = null;
+ public Object parentkey = null;
+ public Blessing parent = null;
+ private Hash cache = new Hash();
public Blessing(JS.Cloneable clonee, Ibex ibex, Blessing parent, Object parentkey) {
super(clonee); this.ibex = ibex; this.parentkey = parentkey; this.parent = parent; }
public Object get(Object key) throws JSExn {
- return key.equals("") ? ((Object)getStatic()) : (new Blessing((JS.Cloneable)clonee.get(key), ibex, this, key));
+ if (key.equals("")) return ((Object)getStatic());
+ if (cache.get(key) != null) return cache.get(key);
+ Object ret = new Blessing((JS.Cloneable)clonee.get(key), ibex, this, key);
+ cache.put(key, ret);
+ return ret;
}
public static Blessing getBlessing(Object o) {
if (!(o instanceof JS)) return null;
}
public JSScope getStatic() {
try {
- // FIXME background?
- if (t == null)
- t = Template.buildTemplate(parentkey + ".t", Stream.getInputStream(parent.get(parentkey + ".t")), ibex);
+ if (t == null) t = Template.buildTemplate(parentkey + ".t", parent.get(parentkey + ".t"), ibex);
return t.staticScope;
} catch (Exception e) {
Log.error(this, e);