X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=c266690290a3c584cdb26ac52a184ca2ec45987f;hb=ae5ffa8160bbd04b3f2ae0722ea089542ab0350e;hp=57a55fa592a6f3f008c27cd48e4778dc78f782fa;hpb=0a13b4988d4952f60f0b28770e6a2240315aecd3;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 57a55fa..c266690 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -7,6 +7,7 @@ import java.text.*;
 import java.util.*;
 import org.xwt.util.*;
 import org.mozilla.javascript.*;
+import org.bouncycastle.util.encoders.Base64;
 
 /** Singleton class that provides all functionality in the xwt.* namespace */
 public final class XWT extends JSObject {
@@ -62,6 +63,13 @@ public final class XWT extends JSObject {
         }
         else if (name.equals("println")) return println;
         else if (name.equals("math")) return org.xwt.util.JSObject.defaultObjects.get("Math", null);
+        else if (name.equals("loadArchive")) return loadArchive;
+        else if (name.equals("prefetchImage")) return prefetchImage;
+        else if (name.equals("prefs")) return prefs;
+        else if (name.equals("encodeURI")) return JSObject.defaultObjects.get("encodeURI", null);
+        else if (name.equals("encodeURIComponent")) return JSObject.defaultObjects.get("encodeURIComponent", null);
+        else if (name.equals("decodeURI")) return JSObject.defaultObjects.get("decodeURI", null);
+        else if (name.equals("decodeURIComponent")) return JSObject.defaultObjects.get("decodeURIComponent", null);
         else return super.get(name, start);
     }
 
@@ -69,19 +77,103 @@ public final class XWT extends JSObject {
         if (name == null) return;
         else if (name.equals("thread") && value != null && value instanceof Function) ThreadMessage.newthread((Function)value);
         else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
+
+        // FIXME: undocumented, possibly insecure
+        else if (name.equals("proxyAuthorization")) {
+            Proxy.Authorization.authorization = value.toString();
+            Proxy.Authorization.waitingForUser.release();
+        }
+
         else super.put(name, start, value);
     }
 
 
-    // JSFunction Instances ///////////////////////////////////////////////////////////////////
+    // Prefs Object //////////////////////////////////////////////////////////////////////////
+
+    static Scriptable prefsRPC = new XMLRPC("http://megacz:mypassword@localhost/RPC2", "prefs");
+
+    private static final JSObject prefs = new JSObject(false, true) {
+            public Object get(String name, Scriptable start) {
+                if (name.equals("get")) return prefsGet;
+                else if (name.equals("list")) return prefsList;
+                else if (name.equals("put")) return prefsPut;
+                else return null;
+            }
+        };
+
+    private static final JSObject.JSFunction prefsGet = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (args.length != 1 || args[0] == null) return null;
+                try {
+                    return ((Function)prefsRPC.get("get", null)).call(cx, null, null, new Object[] { args[0] });
+                } catch (JavaScriptException jse) {
+                    Object val = jse.getValue();
+                    if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode")))
+                        return null;
+                    throw jse;
+                } catch (Exception e) {
+                    // FIXME
+                    throw new JavaScriptException(e.toString());
+                }
+            }
+        };
+
+    private static final JSObject.JSFunction prefsPut = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (args.length < 2 || args[0] == null) return null;
+                try {
+                    return ((Function)prefsRPC.get("put", null)).call(cx, null, null, new Object[] { args[0].toString(), args[1] });
+                } catch (JavaScriptException jse) {
+                    Object val = jse.getValue();
+                    if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode")))
+                        return null;
+                    throw jse;
+                } catch (Exception e) {
+                    // FIXME
+                    throw new JavaScriptException(e.toString());
+                }
+            }
+        };
+
+    private static final JSObject.JSFunction prefsList = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (args.length < 2 || args[0] == null) return null;
+                try {
+                    return ((Function)prefsRPC.get("list", null)).call(cx, null, null, new Object[] { args[0].toString(), args[1] });
+                } catch (JavaScriptException jse) {
+                    Object val = jse.getValue();
+                    if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode")))
+                        return null;
+                    throw jse;
+                } catch (Exception e) {
+                    // FIXME
+                    throw new JavaScriptException(e.toString());
+                }
+            }
+        };
+
+    private static final JSObject.JSFunction prefsInvoke = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (args.length < 2 || args[0] == null) return null;
+                try {
+                    return ((Function)prefs.get("invoke")).call(cx, null, null, new Object[] { args[0].toString(), args[1], "megacz", "mypassword" });
+                } catch (JavaScriptException jse) {
+                    Object val = jse.getValue();
+                    if (val instanceof JSObject && new Integer(1).equals(((JSObject)val).get("faultCode")))
+                        return null;
+                    throw jse;
+                } catch (Exception e) {
+                    // FIXME
+                    throw new JavaScriptException(e.toString());
+                }
+            }
+        };
+
 
-    /** Helper class for defining functions. */
-    private static abstract class JSFunction extends JSObject implements Function {
-        JSFunction() { setSeal(true); }
-        public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; }
-    }
 
-    private static final JSFunction newBrowserWindow = new JSFunction() {
+    // JSFunction Instances ///////////////////////////////////////////////////////////////////
+
+    private static final JSObject.JSFunction newBrowserWindow = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 1 || args[0] == null) return null;
                 Platform.newBrowserWindow(args[0].toString());
@@ -89,23 +181,26 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction yield = new JSFunction() {
+    public static final JSObject.JSFunction yield = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 sleep.call(cx, null, null, null);
                 return null;
             }
         };
 
-    private static final JSFunction println = new JSFunction() {
+    private static final JSObject.JSFunction println = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length == 1)
-                    if (Log.on)
-                        Log.log(cx.interpreterSourceFile, args[0] == null ? "null" : args[0].toString());
+                    if (Log.on) {
+                        String source = cx.interpreterSourceFile;
+                        if (source.endsWith("._")) source = source.substring(0, source.length() - 2);
+                        Log.log(source, args[0] == null ? "null" : args[0].toString());
+                    }
                 return null;
             }
         };
 
-    private static final JSFunction date = new JSFunction() {
+    private static final JSObject.JSFunction date = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "Date", args);
                 } catch (Exception e) {
@@ -116,7 +211,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction regexp = new JSFunction() {
+    private static final JSObject.JSFunction regexp = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 try { return Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "RegExp", args);
                 } catch (Exception e) {
@@ -127,29 +222,41 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction listfonts = new JSFunction() {
+    private static final JSObject.JSFunction listfonts = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 return Context.enter().newArray(org.xwt.util.JSObject.defaultObjects,  Platform.listFonts());
             }
         };
 
-    private static final JSFunction theme = new JSFunction() {
+    private static final JSObject.JSFunction theme = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 2) return null;
                 if (args[0] == null || args[1] == null) return null;
-                Template.retheme(args[0].toString(), args[1].toString());
+
+                for(int i=1; i<args.length; i++) {
+                    if (args[i] instanceof String) {
+                        String from = (String)args[0];
+                        String to = (String)args[i];
+                        if (Log.on) Log.log(this, "retheming from " + from + " to " + to);
+                        Resources.mapFrom.addElement(from);
+                        Resources.mapTo.addElement(to);
+                    }
+                }
+
+                Function callback = args[args.length - 1] instanceof Function ? (Function)args[args.length - 1] : null;
+                Template.retheme(callback);
                 return null;
             }
         };
 
-    private static final JSFunction xmlrpc = new JSFunction() {
+    private static final JSObject.JSFunction xmlrpc = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 1 || args[0] == null) return null;
                 return new XMLRPC(args[0].toString(), "");
             }
         };
 
-    private static final JSFunction soap = new JSFunction() {
+    private static final JSObject.JSFunction soap = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length == 1 && args[0] != null) return new SOAP(args[0].toString(), "", null, null);
                 else if (args.length == 2 && args[0] != null && args[1] != null)
@@ -160,7 +267,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction textwidth = new JSFunction() {
+    private static final JSObject.JSFunction textwidth = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) throws JavaScriptException {
                 if (args.length < 1 || args.length > 2) return null;
                 if (args[0] == null || (args.length == 2 && args[1] == null)) return null;
@@ -173,7 +280,7 @@ public final class XWT extends JSObject {
         };
 
 
-    private static final JSFunction textheight = new JSFunction() {
+    private static final JSObject.JSFunction textheight = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length > 1) return null;
                 if (args.length == 1 && args[0] == null) return null;
@@ -184,14 +291,25 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction newBox = new JSFunction() {
+    private static final JSObject.JSFunction newBox = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                Box ret = new Box(args.length == 0 || args[0] == null ? "box" : args[0].toString(), Template.defaultImportList);
+
+                if (args.length > 0)
+                    if (Log.on) Log.log(XWT.class, "DEPRECATED: xwt.newBox() with multiple arguments is deprecated; use xwt.newBox().apply() " +
+                                        Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+
+                Function callback = null;
+                for(int i=1; i<args.length; i++)
+                    if (args[i] instanceof Function && callback == null)
+                        callback = (Function)args[i];
+
+                Box ret = new Box(args.length == 0 || args[0] == null ? "box" : args[0].toString(), Template.defaultImportList, callback);
+
                 for(int i=1; i<args.length; i++)
                     if (args[i] instanceof Box)
                         ret.put(ret.numChildren(), null, (Box)args[i]);
                 for(int i=1; i<args.length; i++)
-                    if (args[i] instanceof Scriptable && !(args[i] instanceof Box)) {
+                    if (args[i] instanceof Scriptable && !(args[i] instanceof Box) && !(args[i] instanceof Function)) {
                         Scriptable s = (Scriptable)args[i];
                         Object[] keys = s.getIds();
 
@@ -202,7 +320,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction sleep = new JSFunction() {
+    private static final JSObject.JSFunction sleep = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args != null && (args.length != 1 || args[0] == null)) return null;
                 int i = args == null ? 0 : SpecialBoxProperty.stoi(args[0].toString());
@@ -223,7 +341,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction openFile = new JSFunction() {
+    private static final JSObject.JSFunction openFile = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 1) return null;
                 String file = Platform.fileDialog(args[0].toString(), false);
@@ -231,7 +349,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction saveFile = new JSFunction() {
+    private static final JSObject.JSFunction saveFile = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 2) return null;
                 if (!(args[1] instanceof ByteStream)) return null;
@@ -252,7 +370,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction saveFileAs = new JSFunction() {
+    private static final JSObject.JSFunction saveFileAs = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args.length != 2) return null;
                 if (!(args[1] instanceof ByteStream)) return null;
@@ -271,7 +389,7 @@ public final class XWT extends JSObject {
             }
         };
 
-    private static final JSFunction utfEncode = new JSFunction() {
+    private static final JSObject.JSFunction utfEncode = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args == null || args.length != 1) return null;
                 return new ByteStream(args[0].toString().getBytes());
@@ -279,9 +397,9 @@ public final class XWT extends JSObject {
         };
 
     
-    private static final JSFunction parseHTML = new JSFunction() {
+    private static final JSObject.JSFunction parseHTML = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
-                if (args == null || args.length != 1) return null;
+                if (args == null || args.length != 1 || args[0] == null) return null;
                 try {
                     if (args[0] instanceof ByteStream) {
                         return HTML.parseReader(new InputStreamReader(((ByteStream)args[0]).getInputStream()));
@@ -322,7 +440,7 @@ public final class XWT extends JSObject {
         }
     }
 
-    private static final JSFunction recursivePrintObject = new JSFunction() {
+    static final JSObject.JSFunction recursivePrintObject = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
                 if (args == null || args.length != 1) return null;
                 recurse("", "", args[0], cx);
@@ -330,6 +448,75 @@ public final class XWT extends JSObject {
             }
         };
 
+    private static final JSObject.JSFunction loadArchive = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (!ThreadMessage.suspendThread()) return null;
+
+                try {
+                    if (args == null || args.length < 1 || args[0] == null) return null;
+                    URL u = new URL(args[0].toString());
+                    
+                    Function callback = null;
+                    if (args.length == 2 && args[1] != null && args[1] instanceof Function) callback = (Function)args[1];
+                    
+                    if (!u.getFile().endsWith(".xwar")) {
+                        if (Log.on) Log.log(this, "Error: archive names must end with .xwar: " + u.getFile());
+                        throw new JavaScriptException("Error: archive names must end with .xwar: " + u.getFile());
+                    }
+                    
+                    if (u.getProtocol().equals("http")) {
+                        HTTP http = new HTTP(u.toString());
+                        if (Main.originAddr == null) {
+                            try {
+                                Main.originAddr = InetAddress.getByName(u.getHost());
+                            } catch (UnknownHostException e) {
+                                if (Log.on) Log.log(this, "couldn't resolve " + u.getHost() + "; proceeding without permissions");
+                                Main.originAddr = InetAddress.getByName("0.0.0.0");
+                            }
+                        } else {
+                            Main.originAddr = InetAddress.getByName("0.0.0.0");
+                        }
+                        HTTP.HTTPInputStream in = http.GET();
+                        Resources.loadArchive(in, in.getContentLength(), callback);
+
+                    } else if (u.getProtocol().equals("file")) {
+                        if (Main.originAddr != null) {
+                            if (Log.on) Log.log(this, "scripts downloaded from the network may not load xwars from the local filesystem");
+                            throw new JavaScriptException("scripts downloaded from the network may not load xwars from the local filesystem");
+                        }
+                        Resources.loadArchive(new FileInputStream(u.getFile()), (int)new File(u.getFile()).length(), callback);
+                        
+                    } else {
+                        if (Log.on) Log.log(this, "unknown protocol \"" + u.getProtocol() + "\"");
+                        throw new JavaScriptException("unknown protocol \"" + u.getProtocol() + "\"");
+                    }
+                    
+                } catch (MalformedURLException me) {
+                    if (Log.on) Log.log(this, "Malformed URL: " + args[0]);
+                    if (Log.on) Log.log(this, me);
+                    throw new JavaScriptException(me.toString());
+                    
+                } catch (IOException ioe) {
+                    if (Log.on) Log.log(this, "IOException while loading archive:");
+                    if (Log.on) Log.log(this, ioe);
+                    throw new JavaScriptException(ioe.toString());
+
+                } finally {
+                    ThreadMessage.resumeThread();
+
+                }
+                return null;
+            }
+        };
+
+    private static final JSObject.JSFunction prefetchImage = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+                if (args == null || args.length < 1 || args[0] == null) return null;
+                Box.getImage(args[0].toString(), args.length > 1 && args[1] instanceof Function ? (Function)args[1] : null);
+                return null;
+            }
+        };
+
 }