X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=469ba70210f6fdc9088848e17ef80bd5b04e6f5f;hb=b8d3c0cb7d57db7a777460905a402f2d90c1e9b2;hp=3f4cc541479a35342fccbc3c653de11a77a19e3f;hpb=2c0ae10e1f1d99d1661b798e479d2d4e68f523d2;p=org.ibex.core.git diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java index 3f4cc54..469ba70 100644 --- a/src/org/xwt/XWT.java +++ b/src/org/xwt/XWT.java @@ -13,8 +13,8 @@ import org.bouncycastle.util.encoders.Base64; /** Singleton class that provides all functionality in the xwt.* namespace */ public final class XWT extends JS { - public final Res rr; - public XWT(Res rr) { this.rr = rr; } + public final Stream rr; + public XWT(Stream rr) { this.rr = rr; } private Cache subCache = new Cache(20); private Sub getSub(String s) { @@ -30,6 +30,10 @@ public final class XWT extends JS { public String toString() { return "XWTSUB " + key; } public void put(Object key, Object val) throws JSExn { XWT.this.put(this.key + "." + key, val); } public Object get(Object key) throws JSExn { return XWT.this.get(this.key + "." + key); } + public boolean coerceToBoolean() { + if (key.equals("ui.key.alt")) return Surface.alt ? true : false; + return super.coerceToBoolean(); + } public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn { return XWT.this.callMethod(this.key, a0, a1, a2, rest, nargs); } @@ -44,62 +48,64 @@ public final class XWT extends JS { case "math": return xwtMath; case "string": return xwtString; case "date": return METHOD; - case "origin": return Main.origin; + case "origin": return Main.origin; // FIXME not in ref case "box": return new Box(); - case "log": return getSub("log"); + case "apply": return METHOD; + case "graft": return METHOD; + case "clone": return METHOD; + case "regexp": return METHOD; + case "ui.font": return getSub("ui.font"); + 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"); case "ui": return getSub("ui"); - case "thread": return getSub("thread"); - case "font": return getSub("font"); - case "font.sansserif": return Main.builtin.get("fonts/vera/Vera.ttf"); - case "font.monospace": return Main.builtin.get("fonts/vera/VeraMono.ttf"); - case "font.serif": return Main.builtin.get("fonts/vera/VeraSe.ttf"); + case "ui.browser": return METHOD; + case "ui.mouse": return getSub("ui.mouse"); + case "ui.mouse.button": + if (Surface.button1 && !Surface.button2 && !Surface.button3) return N(1); + else if (!Surface.button1 && Surface.button2 && !Surface.button3) return N(2); + else if (!Surface.button1 && !Surface.button2 && Surface.button3) return N(3); + else return ZERO; case "ui.key": return getSub("ui.key"); - case "ui.key.alt": return Surface.alt ? T : F; + case "ui.key.alt": return getSub("ui.key.alt"); + case "ui.key.alt.name": return Platform.altKeyName(); case "ui.key.control": return Surface.control ? T : F; case "ui.key.shift": return Surface.shift ? T : F; case "ui.clipboard": return Platform.getClipBoard(); case "ui.maxdim": return new Integer(Short.MAX_VALUE); - case "ui.key.name": return getSub("ui.key.name"); - case "ui.key.name.alt": return Platform.altKeyName(); case "ui.screen": return getSub("ui.screen"); case "ui.screen.width": return new Integer(Platform.getScreenWidth()); case "ui.screen.height": return new Integer(Platform.getScreenHeight()); - case "fs.home": return System.getProperty("user.home"); - case "fs.temp": return System.getProperty("java.io.tempdir"); - case "ui.mouse": return getSub("ui.mouse"); - case "res": return getSub("res"); - case "ui.mouse.button": - if (Surface.button1 && !Surface.button2 && !Surface.button3) return N(1); - else if (!Surface.button1 && Surface.button2 && !Surface.button3) return N(2); - else if (!Surface.button1 && !Surface.button2 && Surface.button3) return N(3); - else return ZERO; case "undocumented": return getSub("undocumented"); case "undocumented.internal": return getSub("undocumented.internal"); + case "thread": return getSub("thread"); case "thread.yield": return METHOD; case "thread.sleep": return METHOD; - case "res.watch": return METHOD; - case "res.unzip": return METHOD; - case "res.uncab": return METHOD; - case "res.cache": return METHOD; - case "res.url": return METHOD; - case "soap": return METHOD; - case "apply": return METHOD; - case "graft": return METHOD; - case "ui.browser": return METHOD; - case "clone": return METHOD; - case "log.print": return METHOD; - case "log.println": return METHOD; - case "log.dump": return METHOD; - case "regexp": return METHOD; - case "rpc.xml": return METHOD; - case "rpc.soap": return METHOD; + case "stream": return getSub("stream"); + case "stream.home": return url2res("file:" + System.getProperty("user.home")); + case "stream.temp": return url2res("file:" + System.getProperty("java.io.tempdir")); + case "stream.watch": return METHOD; + case "stream.unzip": return METHOD; + case "stream.uncab": return METHOD; + case "stream.cache": return METHOD; + case "stream.url": return METHOD; + case "stream.parse.html": return METHOD; + case "stream.parse.xml": return METHOD; + case "stream.parse.utf8": return METHOD; + case "net": return getSub("net"); + case "net.rpc": return getSub("net.rpc"); + case "net.rpc.xml": return METHOD; + case "net.rpc.soap": return METHOD; + case "log": return getSub("log"); + case "log.debug": return METHOD; + case "log.info": return METHOD; + case "log.warn": return METHOD; + case "log.error": return METHOD; + case "crypto": return getSub("crypto"); case "crypto.rsa": return METHOD; case "crypto.md5": return METHOD; case "crypto.sha1": return METHOD; case "crypto.rc4": return METHOD; - case "stream.parse.html": return METHOD; - case "stream.parse.xml": return METHOD; - case "stream.parse.utf8": return METHOD; //#end return super.get(name); } @@ -108,7 +114,11 @@ public final class XWT extends JS { //#switch(name) case "thread": Scheduler.add((JSFunction)value); return; case "ui.clipboard": Platform.setClipBoard((String)value); return; - case "ui.frame": Platform.createSurface((Box)value, true, true); return; + case "ui.frame": + Box b = (Box)value; + Surface s = Platform.createSurface(b,true, true); + if(b.get("titlebar") != null) s.setTitleBarText(JS.toString(b.get("titlebar"))); + return; case "ui.window": Platform.createSurface((Box)value, false, true); return; case "undocumented.internal.proxyAuthorization": HTTP.Proxy.Authorization.authorization = value.toString(); @@ -122,12 +132,12 @@ public final class XWT extends JS { try { //#switch(name) case "date": return new JSDate(a, b, c, rest, nargs); - case "rpc.soap": return null;//new SOAP((String)a, "", (String)b, (String)c); + case "rpc.soap": return new SOAP((String)a, "", (String)b, (String)c); case "graft": if (a instanceof Box) throw new JSExn("can't graft onto Boxes"); if (a instanceof String) throw new JSExn("can't graft onto Strings"); if (a instanceof Number) throw new JSExn("can't graft onto Numbers"); - if (a instanceof Res) return new Res.Graft((Res)a, b, c); + if (a instanceof Stream) return new Stream.Graft((Stream)a, b, c); // FEATURE: grafting onto JS throw new JSExn("cannot graft onto "+a.getClass()); //#end @@ -141,32 +151,33 @@ public final class XWT extends JS { case 1: //#switch(name) case "ui.browser": Platform.newBrowserWindow((String)a); return null; - case "clone": return new XWT((Res)a); - case "res.unzip": return new Res.Zip((Res)a); - case "res.uncab": return new Res.Cab((Res)a); - case "res.cache": try { return new Res.CachedRes((Res)a, "resources", true); } - catch (Res.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); } - case "res.url": return url2res((String)a); + case "clone": return new XWT((Stream)a); + case "stream.unzip": return new Stream.Zip((Stream)a); + case "stream.uncab": return new Stream.Cab((Stream)a); + case "stream.cache": try { return new Stream.CachedStream((Stream)a, "resources", true); } + catch (Stream.NotCacheableException e) { throw new JSExn("this resource cannot be cached"); } + case "stream.url": return url2res((String)a); case "thread.sleep": sleep(JS.toInt(a)); return null; - case "log.print": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; - case "log.println": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; - case "log.dump": Log.recursiveLog("","",a); return null; + case "log.debug": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.info": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.warn": JS.log(this, a== null ? "**null**" : a.toString()); return null; + case "log.error": JS.log(this, a== null ? "**null**" : a.toString()); return null; case "regexp": return new JSRegexp(a, null); case "rpc.xml": return new XMLRPC((String)a, ""); case "crypto.rsa": /* FEATURE */ return null; case "crypto.md5": /* FEATURE */ return null; case "crypto.sha1": /* FEATURE */ return null; case "crypto.rc4": /* FEATURE */ return null; - case "stream.parse.html": /* FEATURE */ return null; - case "stream.parse.xml": /* FEATURE */ return null; - case "stream.parse.utf8": /* FEATURE */ return null; + case "stream.parse.html": /* FIXME */ return null; + case "stream.parse.xml": /* FIXME -- SAX NOT DOM!! */ return null; + case "stream.parse.utf8": /* FIXME */ return null; //#end break; case 2: //#switch(name) - case "res.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b); + case "stream.watch": return new Stream.ProgressWatcher((Stream)a, (JSFunction)b); case "apply": - if (b instanceof Res) Template.getTemplate((Res)b).apply((Box)a, XWT.this); + if (b instanceof Stream) Template.getTemplate((Stream)b).apply((Box)a, XWT.this); else { JS to = (JS)a, from = (JS)b; Object k; for (Enumeration e = from.keys(); e.hasMoreElements();) { @@ -174,22 +185,26 @@ public final class XWT extends JS { } } return a; + case "regexp": return new JSRegexp(a, b); //#end break; } } catch (RuntimeException e) { + // FIXME: maybe JSExn should take a second argument, Exception + Log.info(this, "xwt."+name+"() threw: " + e); throw new JSExn("invalid argument for xwt object method "+name+"()"); } throw new JSExn("invalid number of arguments for xwt object method "+name+"()"); } - public Res url2res(String url) throws JSExn { - if (url.startsWith("http://")) return new Res.HTTP(url); - else if (url.startsWith("https://")) return new Res.HTTP(url); - else if (url.startsWith("data:")) return new Res.ByteArray(Base64.decode(url.substring(5)), null); - else if (url.startsWith("utf8:")) return new Res.ByteArray(url.substring(5).getBytes(), null); + public Stream url2res(String url) throws JSExn { + if (url.startsWith("http://")) return new Stream.HTTP(url); + else if (url.startsWith("https://")) return new Stream.HTTP(url); + else if (url.startsWith("data:")) return new Stream.ByteArray(Base64.decode(url.substring(5)), null); + else if (url.startsWith("utf8:")) return new Stream.ByteArray(url.substring(5).getBytes(), null); else throw new JSExn("invalid resource specifier " + url); + // FIXME support file:// via dialog boxes } public static void sleep(final int i) throws JSExn { @@ -241,18 +256,18 @@ public final class XWT extends JS { private class XMLHelper extends XML { Vector obStack = new Vector(); public XMLHelper() { super(BUFFER_SIZE); } - public void startElement(XML.Element c) throws XML.SchemaException { + public void startElement(XML.Element c) throws XML.Exn { try { JS o = new JS(); - o.put("$name", c.localName); - for(int i=0; i= 1 ? (JS)obStack.elementAt(0) : null;