X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=811a64304345a427aba554d9853ba61416e06fb9;hb=0b0673bbc7f06c5d5418d5ab7ad5961a464e2de0;hp=8b0fef79b437fc5cf0fe4870c1d78d49e4da4a35;hpb=f11aab193c3ed2594d03d66b6adb869564686bc0;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 8b0fef7..811a643 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -11,119 +11,151 @@ 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 JS.Obj {
+public final class XWT extends JSCallable {
 
     public final Res rr;
     public XWT(Res rr) { this.rr = rr; }
 
-    public Object get(Object name) {
+    /** lets us put multi-level get/put/call keys all in the same method */
+    private class Sub extends JSCallable {
+        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 method, JSArray args) { return XWT.this.call(method == null ? key : this.key + "." + method, args); }
+    }
+
+    public Object _get(Object name) {
         //#switch(name)
         case "math": return xwtMath;
         case "string": return xwtString;
-        case "date": return new org.xwt.js.Date();
+        case "date": return new JSDate();
         case "origin": return Main.origin;
-        case "box": return new Box();
+        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 "ui.clipboard": return Platform.getClipBoard();
         case "ui.maxdim": return new Integer(Short.MAX_VALUE);
-        case "ui.key.alt.name": return Platform.altKeyName();
+        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.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");
         //#end
-        return rr.get(name);
+        return null;
+    }
+
+    public Object get(Object name) {
+        Object ret = _get(name);
+        if (ret != null) return ret;
+        return !name.equals("clone") && !name.equals("apply") ? rr.get(name) : null;
     }
 
-    public Object put(Object name, final Object value) {
+    public void put(Object name, final Object value) {
         //#switch(name)
         case "thread":
-            Scheduler.add(new Scheduler.Task() { public void perform() { new JS.Context((Function)value, null).resume(); } });
-            return null;
-        case "ui.clipboard": Platform.setClipBoard((String)value); return null;
-        case "ui.frame": Platform.createSurface((Box)value, true, true); return null;
-        case "ui.window": Platform.createSurface((Box)value, false, true); return null;
+            System.out.println("new thread " + value);
+            Scheduler.add(new Scheduler.Task() {
+                    public String toString() { return "thread 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 "undocumented.internal.proxyAuthorization":
             HTTP.Proxy.Authorization.authorization = value.toString();
             HTTP.Proxy.Authorization.waitingForUser.release();
-            return null;
         //#end
-        return super.put(name, value);
     }
 
-    public Object callMethod(Object name, boolean checkOnly, JS.Array args) throws JS.Exn {
+    public Object call(Object name, JSArray args) throws JS.Exn {
         Object a = args.elementAt(0);
         Object b = args.elementAt(1);
         Object c = args.elementAt(2);
-        if (name.equals("date")) return new org.xwt.js.Date(args);
-        else if (args.length() == 0 && name.equals("thread.yield")) return checkOnly ? T : sleep(0);
+        if (name.equals("date")) return new org.xwt.js.JSDate(args);
+        else if (args.length() == 0 && name.equals("thread.yield")) { sleep(0); return null; }
         else if (args.length() == 2) {
             //#switch(name)
-            case "res.watch": return checkOnly ? T : new Res.ProgressWatcher((Res)a, (Function)b);
-            case "soap": return checkOnly ? T : new SOAP((String)args.elementAt(0), "", (String)args.elementAt(1), null);
-            case "apply": if (checkOnly) return T;
-                Template.getTemplate((Res)args.elementAt(1)).apply((Box)args.elementAt(0), null, XWT.this);
+            case "res.watch": return new Res.ProgressWatcher((Res)a, (JSFunction)b);
+            case "soap": return new SOAP((String)args.elementAt(0), "", (String)args.elementAt(1), null);
+            case "apply":
+                Template.getTemplate((Res)args.elementAt(1)).apply((Box)args.elementAt(0), XWT.this);
                 return args.elementAt(0);
             //#end
         } else if (args.length() == 3 && name.equals("soap")) {
             if (name.equals("soap")) {
-                if (checkOnly) return T;
                 return new SOAP((String)args.elementAt(0), "", (String)args.elementAt(1), (String)args.elementAt(2));
             } else if (name.equals("graft")) {
-                if (checkOnly) return T;
                 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)");
-                // FIXME if (a instanceof Res) return new Res.Graft((Res)a, b, c);
+                if (a instanceof Res) return new Res.Graft((Res)a, b, c);
                 return new JS.Graft((JS)a, b, c);
             }
         } else if (args.length() == 1) {
             //#switch(name)
-            case "ui.browser": if (checkOnly) return T; Platform.newBrowserWindow((String)a); return null;
-            case "clone": return checkOnly ? T : new XWT((Res)a);
-            case "res.unzip": return checkOnly ? T : new Res.Zip((Res)a);
-            case "res.uncab": return checkOnly ? T : new Res.Cab((Res)a);
-            case "res.cache": return checkOnly ? T : new Res.CachedRes((Res)a, "resources", true);
-            case "res.fromURL": return checkOnly ? T : Res.stringToRes((String)a);
-            case "thread.sleep": return checkOnly ? T : sleep(JS.toInt(a));
-            case "log.println": if (checkOnly) return T; Log.logJS(this, a== null ? "**null**" : a.toString()); return null;
-            case "log.dump": if (checkOnly) return T; JS.recurse("", "", a); return null;
-            case "regexp": return checkOnly ? T : new Regexp(a, null);
-            case "rpc.xml": return checkOnly ? T : new XMLRPC((String)a, "");
-            case "rpc.soap": return checkOnly ? T : new SOAP((String)a, "", null, null);
-            case "crypto.rsa": /* FIXME */ break;
-            case "crypto.md5": /* FIXME */ break;
-            case "crypto.sha1": /* FIXME */ break;
-            case "crypto.rc4": /* FIXME */ break;
-            case "stream.parse.html": /* FIXME */ break;
-            case "stream.parse.xml": /* FIXME */ break;
-            case "stream.parse.utf8": /* FIXME */ break;
+            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
         }
-        return super.callMethod(name, args, checkOnly);
+        return null;
     }
 
-    // FIXME
-    public static Object sleep(final int i) {
-        final JS.Context jsthread = JS.Context.current();
+    public static void sleep(final int i) {
+        final Callback callback = JSContext.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() {
-                jsthread.resume();
-            } }); } }.start();
-        return JS.Context.pause;
+        new Thread() {
+            public void run() {
+                try { Thread.sleep(i); } catch (InterruptedException e) { }
+                Scheduler.add(new Scheduler.Task() { public void perform() { callback.call(null); } });
+            }
+        }.start();
     }
     
-    public static final org.xwt.js.Math xwtMath = new org.xwt.js.Math() {
-            private JS gs = new JS.GlobalScope();
+    public static final JSMath xwtMath = new JSMath() {
+            private JS gs = new JSScope.Global(null);
+            public String toString() { return "XWTMATH"; }
             public Object get(Object key) {
                 //#switch(key)
                 case "isNaN": return gs.get("isNaN");
@@ -135,8 +167,9 @@ public final class XWT extends JS.Obj {
             }
         };
 
-    public static final JS.Obj xwtString = new JS.Obj(true) {
-            private JS gs = new JS.GlobalScope();
+    public static final JSObj xwtString = new JSObj() {
+            private JS gs = new JSScope.Global(null);
+            public void put(Object key, Object val) { }
             public Object get(Object key) {
                 //#switch(key)
                 case "parseInt": return gs.get("parseInt");
@@ -152,4 +185,51 @@ public final class XWT extends JS.Obj {
                 return super.get(key);
             }
         };
+
+    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 JSObj();
+            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 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 {
+                parent.put("$numchildren", new Integer(numchildren + 1));
+                parent.put(new Integer(numchildren), s);
+            }
+        }
+        public void whitespace(char[] ch, int start, int length) {}
+        public JS doParse(InputStream is) throws JS.Exn {
+            try { 
+                BufferedReader r = new BufferedReader(new InputStreamReader(is));
+                parse(r);
+            } catch (XML.XMLException e) {
+                throw new JS.Exn("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");
+            }
+            return obStack.size() >= 1 ? (JS)obStack.elementAt(0) : null;
+        }
+    }
 }