X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=0572b66446d2e7ae1272e5afbec54c66032cc055;hp=51e37f3adc65ed1cad39b55699988830ccb8a7c6;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hpb=6f2339751a675c8bc42a9a496d3032ea70cc0e55

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 51e37f3..0572b66 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -11,172 +11,218 @@ import org.xwt.translators.*;
 import org.bouncycastle.util.encoders.Base64;
 
 /** Singleton class that provides all functionality in the xwt.* namespace */
-public final class XWT extends JSCallable {
+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) {
+        Sub ret = (Sub)subCache.get(s);
+        if (ret == null) subCache.put(s, ret = new Sub(s));
+        return ret;
+    }
 
     /** lets us put multi-level get/put/call keys all in the same method */
-    private class Sub extends JSCallable {
+    private class Sub extends JS {
         String key;
         Sub(String key) { this.key = key; }
         public String toString() { return "XWTSUB " + key; }
-        public void put(Object key, Object val) { XWT.this.put(this.key + "." + key, val); }
-        public Object get(Object key) { return XWT.this.get(this.key + "." + key); }
-        public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) {
+        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);
         }
-        public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) {
+        public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
             return XWT.this.callMethod(this.key + "." + method, a0, a1, a2, rest, nargs);
         }
     }
 
-    public Object get(Object name) {
+    public Object get(Object name) throws JSExn {
+        if (name instanceof String && ((String)name).length() == 0) return rr;
         //#switch(name)
         case "math": return xwtMath;
         case "string": return xwtString;
         case "date": return METHOD;
-        case "origin": return Main.origin;
-        case "box": return new BoxTree();
-        case "log": return new Sub("log");
-        case "ui": return new Sub("ui");
-        case "thread": return new Sub("thread");
-        case "ui.key": return new Sub("ui.key");
-        case "ui.key.alt": return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
-        case "ui.key.control": return Surface.control ? Boolean.TRUE : Boolean.FALSE;
-        case "ui.key.shift": return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
+        case "origin": return Main.origin;  // FIXME not in ref
+        case "box": return new Box();
+        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 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 new Sub("ui.key.name");
-        case "ui.key.name.alt": return Platform.altKeyName();
-        case "ui.screen": return new Sub("ui.screen");
+        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 new Sub("ui.mouse");
-        case "res": return new Sub("res");
-        case "ui.mouse.button":
-            if (Surface.button1 && !Surface.button2 && !Surface.button3) return new Integer(1);
-            else if (!Surface.button1 && Surface.button2 && !Surface.button3) return new Integer(2);
-            else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(3);
-            else return new Integer(0);
-        case "undocumented": return new Sub("undocumented");
-        case "undocumented.internal": return new Sub("undocumented.internal");
+        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 "soap": return METHOD;
-        case "apply": return METHOD;
-        case "graft": return METHOD;
-        case "ui.browser": return METHOD;
-        case "clone": return METHOD;
-        case "res.unzip": return METHOD;
-        case "res.uncab": return METHOD;
-        case "res.cache": return METHOD;
-        case "res.url": 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 rr.get(name);
+        return super.get(name);
     }
 
-    public void put(Object name, final Object value) {
+    public void put(Object name, final Object value) throws JSExn {
         //#switch(name)
-        case "thread":
-            Scheduler.add(new Scheduler.Task() { public void perform() { JSContext.invokePauseable((JSFunction)value); } });
-        case "ui.clipboard": Platform.setClipBoard((String)value);
-        case "ui.frame": Platform.createSurface((Box)value, true, true);
-        case "ui.window": Platform.createSurface((Box)value, false, true);
+        case "thread": Scheduler.add((JSFunction)value); return;
+        case "ui.clipboard": Platform.setClipBoard((String)value); 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();
-            HTTP.Proxy.Authorization.waitingForUser.release();
+            HTTP.Proxy.Authorization.waitingForUser.release(); return;
         //#end
+
+        throw new JSExn("attempted to put unknown property: xwt."+name);
     }
 
-    public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JS.Exn {
-        if (name.equals("date")) {
-            JSArray args = new JSArray();
-            for(int i=0; i<nargs; i++) args.addElement(i==0?a:i==1?b:i==2?c:rest[i-3]);
-            return new org.xwt.js.JSDate(args);
-        }
-        else if (nargs == 0 && name.equals("thread.yield")) { sleep(0); return null; }
-        else if (nargs == 2) {
+    public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn {
+        try {
             //#switch(name)
-            case "res.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b);
-            case "soap": return new SOAP((String)a, "", (String)b, null);
-            case "apply":
-                Template.getTemplate((Res)b).apply((Box)a, XWT.this);
-                return a;
+            case "date": return new JSDate(a, b, c, rest, nargs);
+            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 Stream) return new Stream.Graft((Stream)a, b, c);
+                // FEATURE: grafting onto JS
+                throw new JSExn("cannot graft onto "+a.getClass());
             //#end
-        } else if (nargs == 3 && name.equals("soap")) {
-            if (name.equals("soap")) {
-                return new SOAP((String)a, "", (String)b, (String)c);
-            } else if (name.equals("graft")) {
-                if (a instanceof Box) throw new JS.Exn("can't graft onto Boxes (yet)");
-                if (a instanceof Number) throw new JS.Exn("can't graft onto Numbers (yet)");
-                if (a instanceof String) throw new JS.Exn("can't graft onto Strings (yet)");
-                if (a instanceof Res) return new Res.Graft((Res)a, b, c);
-                return new JS.Graft((JS)a, b, c);
+ 
+            switch (nargs) {
+                case 0:
+                    //#switch(name)
+                    case "thread.yield": sleep(0); return null;
+                    //#end
+                    break;
+                case 1:
+                    //#switch(name)
+                    case "ui.browser": Platform.newBrowserWindow((String)a); return null;
+                    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.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": /* 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 "stream.watch": return new Stream.ProgressWatcher((Stream)a, (JSFunction)b);
+                    case "apply":
+                        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();) {
+                                k = e.nextElement(); to.put(k, from.get(k));
+                            }
+                        }
+                        return a;
+                    case "regexp": return new JSRegexp(a, b);
+                    //#end
+                    break;
             }
-        } else if (nargs == 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 JS.Exn("this resource cannot be cached"); }
-            case "res.url":
-                String url = (String)a;
-                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);
-                throw new JS.Exn("invalid resource specifier " + url);
-            case "thread.sleep": sleep(JS.toInt(a)); return null;
-            case "log.println": Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
-            case "log.dump": Log.recursiveLog("","",a); return null;
-            case "regexp": return new JSRegexp(a, null);
-            case "rpc.xml": return new XMLRPC((String)a, "");
-            case "rpc.soap": return new SOAP((String)a, "", null, null);
-            case "crypto.rsa": /* FEATURE */ break;
-            case "crypto.md5": /* FEATURE */ break;
-            case "crypto.sha1": /* FEATURE */ break;
-            case "crypto.rc4": /* FEATURE */ break;
-            case "stream.parse.html": /* FEATURE */ break;
-            case "stream.parse.xml": /* FEATURE */ break;
-            case "stream.parse.utf8": /* FEATURE */ break;
-            //#end
+        } 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+"()");
         }
-        return null;
+
+        throw new JSExn("invalid number of arguments for xwt object method "+name+"()");
     }
 
-    public static void sleep(final int i) {
-        final Callback callback = JSContext.pause();
-        final long currentTime = System.currentTimeMillis();
-        new Thread() {
-            public void run() {
+    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 {
+        try {
+            final JS.UnpauseCallback callback = JS.pause();
+            final long currentTime = System.currentTimeMillis();
+            new Thread() { public void run() {
                 try { Thread.sleep(i); } catch (InterruptedException e) { }
-                Scheduler.add(new Scheduler.Task() { public void perform() { callback.call(null); } });
-            }
-        }.start();
+                Scheduler.add(callback);
+            } }.start();
+        } catch (JS.NotPauseableException npe) {
+            throw new JSExn("you cannot sleep or yield in the foreground thread");
+        }
     }
     
     public static final JSMath xwtMath = new JSMath() {
-            private JS gs = new JSScope.Global(null);
+            private JS gs = new JSScope.Global();
             public String toString() { return "XWTMATH"; }
-            public Object get(Object key) {
+            public Object get(Object key) throws JSExn {
                 //#switch(key)
                 case "isNaN": return gs.get("isNaN");
                 case "isFinite": return gs.get("isFinite");
@@ -188,9 +234,9 @@ public final class XWT extends JSCallable {
         };
 
     public static final JS xwtString = new JS() {
-            private JS gs = new JSScope.Global(null);
+            private JS gs = new JSScope.Global();
             public void put(Object key, Object val) { }
-            public Object get(Object key) {
+            public Object get(Object key) throws JSExn {
                 //#switch(key)
                 case "parseInt": return gs.get("parseInt");
                 case "parseFloat": return gs.get("parseFloat");
@@ -209,45 +255,57 @@ public final class XWT extends JSCallable {
     private class XMLHelper extends XML {
         Vector obStack = new Vector();
         public XMLHelper() { super(BUFFER_SIZE); }
-        public void startElement(XML.Element c) throws XML.SchemaException {
-            JS o = new JS();
-            o.put("$name", c.localName);
-            for(int i=0; i<c.len; i++) o.put(c.keys[i], c.vals[i]);
-            o.put("$numchildren", new Integer(0));
-            obStack.addElement(o);
-        }
-        public void endElement(XML.Element c) throws XML.SchemaException {
-            if (obStack.size() == 1) return;
-            JS me = (JS)obStack.lastElement();
-            obStack.setSize(obStack.size() - 1);
-            JS parent = (JS)obStack.lastElement();
-            int numchildren = ((Integer)parent.get("$numchildren")).intValue();
-            parent.put("$numchildren", new Integer(numchildren + 1));
-            parent.put(new Integer(numchildren), me);
+        public void startElement(XML.Element c) throws XML.Exn {
+            try {
+                JS o = new JS();
+                o.put("$name", c.getLocalName());
+                for(int i=0; i < c.getAttrLen(); i++) o.put(c.getAttrKey(i), c.getAttrVal(i));
+                o.put("$numchildren", new Integer(0));
+                obStack.addElement(o);
+            } catch (JSExn jse) {
+                throw new Error("this should never happen");
+            }
         }
-        public void characters(char[] ch, int start, int length) throws XML.SchemaException {
-            String s = new String(ch, start, length);
-            JS parent = (JS)obStack.lastElement();
-            int numchildren = ((Integer)parent.get("$numchildren")).intValue();
-            Object lastChild = parent.get(new Integer(numchildren - 1));
-            if (lastChild instanceof String) {
-                parent.put(new Integer(numchildren - 1), lastChild + s);
-            } else {
+        public void endElement(XML.Element c) throws XML.Exn {
+            try {
+                if (obStack.size() == 1) return;
+                JS me = (JS)obStack.lastElement();
+                obStack.setSize(obStack.size() - 1);
+                JS parent = (JS)obStack.lastElement();
+                int numchildren = ((Integer)parent.get("$numchildren")).intValue();
                 parent.put("$numchildren", new Integer(numchildren + 1));
-                parent.put(new Integer(numchildren), s);
+                parent.put(new Integer(numchildren), me);
+            } catch (JSExn jse) {
+                throw new Error("this should never happen");
+            }
+        }
+        public void characters(char[] ch, int start, int length) throws XML.Exn {
+            try {
+                String s = new String(ch, start, length);
+                JS parent = (JS)obStack.lastElement();
+                int numchildren = ((Integer)parent.get("$numchildren")).intValue();
+                Object lastChild = parent.get(new Integer(numchildren - 1));
+                if (lastChild instanceof String) {
+                    parent.put(new Integer(numchildren - 1), lastChild + s);
+                } else {
+                    parent.put("$numchildren", new Integer(numchildren + 1));
+                    parent.put(new Integer(numchildren), s);
+                }
+            } catch (JSExn jse) {
+                throw new Error("this should never happen");
             }
         }
         public void whitespace(char[] ch, int start, int length) {}
-        public JS doParse(InputStream is) throws JS.Exn {
+        public JS doParse(InputStream is) throws JSExn {
             try { 
                 BufferedReader r = new BufferedReader(new InputStreamReader(is));
                 parse(r);
-            } catch (XML.XMLException e) {
-                throw new JS.Exn("error parsing XML: " + e.toString());
+            } catch (XML.Exn e) {
+                throw new JSExn("error parsing XML: " + e.toString());
             } catch (IOException e) {
-                if (Log.on) Log.log(this, "IO Exception while reading from file");
-                if (Log.on) Log.log(this, e);
-                throw new JS.Exn("error reading from Resource");
+                if (Log.on) Log.info(this, "IO Exception while reading from file");
+                if (Log.on) Log.info(this, e);
+                throw new JSExn("error reading from Resource");
             }
             return obStack.size() >= 1 ? (JS)obStack.elementAt(0) : null;
         }