From: megacz Date: Fri, 30 Jan 2004 07:43:20 +0000 (+0000) Subject: 2003/12/27 01:03:54 X-Git-Tag: RC3~240 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=98989bf5bfb23098687961adbb308aab572c60a3 2003/12/27 01:03:54 darcs-hash:20040130074320-2ba56-fffb0cd768720818ca81d3f66ff11f1650792b17.gz --- diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java index 43178da..71d3feb 100644 --- a/src/org/xwt/XWT.java +++ b/src/org/xwt/XWT.java @@ -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,63 @@ 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 "ui": return getSub("ui"); - case "thread": return getSub("thread"); + case "apply": return METHOD; + case "graft": return METHOD; + case "clone": return METHOD; + case "regexp": return METHOD; 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": return getSub("ui"); + 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 "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 "rpc": return getSub("rpc"); case "rpc.xml": return METHOD; case "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); } @@ -122,7 +127,7 @@ 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"); @@ -142,29 +147,30 @@ public final class XWT extends JS { //#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); } + case "stream.unzip": return new Res.Zip((Res)a); + case "stream.uncab": return new Res.Cab((Res)a); + case "stream.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 "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": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; + case "log.info": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; + case "log.warn": Log.logJS(this, a== null ? "**null**" : a.toString()); return null; + case "log.error": Log.logJS(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 Res.ProgressWatcher((Res)a, (JSFunction)b); case "apply": if (b instanceof Res) Template.getTemplate((Res)b).apply((Box)a, XWT.this); else { @@ -192,6 +198,7 @@ public final class XWT extends JS { 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); else throw new JSExn("invalid resource specifier " + url); + // FIXME support file:// via dialog boxes } public static void sleep(final int i) throws JSExn {