X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=7d73e9c78d859638d5d7ba259eeb394de941184f;hb=26425831523e621df99c1a75312f9eaf61ed90cc;hp=6ea3c0e8a45927a9c8cece4983f85ab2b264e6e1;hpb=9a33358173f08013fdacd02c11f3823352bdae23;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 6ea3c0e..7d73e9c 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 {
@@ -64,6 +65,11 @@ public final class XWT extends JSObject {
         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);
     }
 
@@ -71,10 +77,100 @@ 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);
     }
 
 
+    // 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());
+                }
+            }
+        };
+
+
+
     // JSFunction Instances ///////////////////////////////////////////////////////////////////
 
     private static final JSObject.JSFunction newBrowserWindow = new JSObject.JSFunction() {
@@ -136,7 +232,19 @@ public final class XWT extends JSObject {
             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;
             }
         };
@@ -186,6 +294,10 @@ public final class XWT extends JSObject {
     private static final JSObject.JSFunction newBox = new JSObject.JSFunction() {
             public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
 
+                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)
@@ -328,8 +440,8 @@ public final class XWT extends JSObject {
         }
     }
 
-    private static final JSObject.JSFunction recursivePrintObject = new JSObject.JSFunction() {
-            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+    static final JSObject.JSFunction recursivePrintObject = new JSObject.JSFunction() {
+            public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) {
                 if (args == null || args.length != 1) return null;
                 recurse("", "", args[0], cx);
                 return null;
@@ -364,8 +476,9 @@ public final class XWT extends JSObject {
                         } else {
                             Main.originAddr = InetAddress.getByName("0.0.0.0");
                         }
-                        Resources.loadArchive(http.getInputStream(), (int)http.getContentLength(), callback);
-                        
+                        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");