X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=0329a60f3a3f5da713a63ca7427ff34f336cde8c;hb=f8e2aa0c7c2b5bd2bca1808fb15dfc8e75d96d56;hp=015255bc0a24ca455b92bc430697a9ebbcd11306;hpb=9999130dda9fa3b8b3d70387d87e123fad958a28;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 015255b..0329a60 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -1,4 +1,4 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.io.*;
@@ -13,6 +13,8 @@ import org.bouncycastle.util.encoders.Base64;
 public final class XWT extends JS.Obj {
 
     public static final XWT singleton = new XWT();
+    private final JS xwtMath = new XWTMath();
+    private final JS xwtString = new XWTString();
 
     /** each key is a string representing a filename which the user has already given XWT permission to write to */
     private static Hashtable safeFiles = new Hashtable();
@@ -29,10 +31,6 @@ public final class XWT extends JS.Obj {
             else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(1);
             else return new Integer(0);
         }
-        else if (name.equals("encodeURI")) throw new Error("not implemented");
-        else if (name.equals("encodeURIComponent")) throw new Error("not implemented");
-        else if (name.equals("decodeURI")) throw new Error("not implemented");
-        else if (name.equals("decodeURIComponent")) throw new Error("not implemented");
         else return super.get(name);
     }
 
@@ -41,8 +39,8 @@ public final class XWT extends JS.Obj {
         else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
         else if (name.equals("proxyAuthorization")) {
             // FIXME: undocumented, possibly insecure
-            Proxy.Authorization.authorization = value.toString();
-            Proxy.Authorization.waitingForUser.release();
+            HTTP.Proxy.Authorization.authorization = value.toString();
+            HTTP.Proxy.Authorization.waitingForUser.release();
         } else super.put(name, value);
     }
 
@@ -55,7 +53,8 @@ public final class XWT extends JS.Obj {
         super.put("fileSeparator", File.separator);
         super.put("homeDir", System.getProperty("user.home"));
         super.put("tempDir", System.getProperty("java.io.tempdir"));
-        super.put("math", org.xwt.js.JS.Math);
+        super.put("math", xwtMath);
+        super.put("string", xwtString);
 
         super.put("newBrowserWindow", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1 || args.elementAt(0) == null) return null;
@@ -63,21 +62,18 @@ public final class XWT extends JS.Obj {
             return null;
         }});
 
-        super.put("parseFloat", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args.length() != 1 || args.elementAt(0) == null) return null;
-            return new Float(args.elementAt(0).toString());
-        }});
-
-        super.put("parseInt", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args.length() != 1 || args.elementAt(0) == null) return null;
-            return new Float(args.elementAt(0).toString());
-        }});
-
+        super.put("parseInt",xwtString.get("parseInt"));
+        super.put("parseFloat",xwtString.get("parseFloat"));
+        
         super.put("yield", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             sleep(0);
             return null;
         }});
 
+        super.put("load", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+            return Res.stringToRes(args.elementAt(0).toString());
+        }});
+
         super.put("theme", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
                 if (args.length() != 2) return null;
                 if (args.elementAt(0) == null || args.elementAt(1) == null) return null;
@@ -109,9 +105,7 @@ public final class XWT extends JS.Obj {
         }});
 
         super.put("regexp", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            //throw new Error("not implemented");
-            Log.log(XWT.class, "regexp not implemented");
-            return null;
+            return new Regexp(args);
         }});
 
         super.put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
@@ -140,18 +134,14 @@ public final class XWT extends JS.Obj {
             if (args.elementAt(0) == null || (args.length() == 2 && args.elementAt(1) == null)) return null;
             String font = args.length() == 1 ? Platform.getDefaultFont() : args.elementAt(0).toString();
             String text = args.length() == 1 ? args.elementAt(0).toString() : args.elementAt(1).toString();
-            XWF xwf = XWF.getXWF(font);
-            if (xwf == null) return new Integer(Platform.stringWidth(font, text));
-            else return new Integer(xwf.stringWidth(text));
+            return new Integer(Platform.stringWidth(font, text));
         }});
 
         super.put("textheight", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() > 1) return null;
             if (args.length() == 1 && args.elementAt(0) == null) return null;
             String font = args.length() == 0 || args.elementAt(0) == null ? Platform.getDefaultFont() : args.elementAt(0).toString();
-            XWF xwf = XWF.getXWF(font);
-            if (xwf == null) return new Integer(Platform.getMaxAscent(font) + Platform.getMaxDescent(font));
-            else return new Integer(xwf.getMaxAscent() + xwf.getMaxDescent());
+            return new Integer(Platform.getMaxAscent(font) + Platform.getMaxDescent(font));
         }});
         
         super.put("newBox", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
@@ -160,8 +150,10 @@ public final class XWT extends JS.Obj {
             for(int i=1; i<args.length(); i++)
                 if (args.elementAt(i) instanceof JS.Callable && callback == null)
                     callback = (JS.Callable)args.elementAt(i);
-            Box ret = new Box(args.length() == 0 || args.elementAt(0) == null ? "box" : args.elementAt(0).toString(),
-                              Template.defaultImportList, callback);
+            Box ret = new Box();
+            if (!(args.length() == 0 || args.elementAt(0) == null))
+                Template.getTemplate(args.elementAt(0).toString(),
+                                     Template.defaultImportList).apply(ret, null, null, callback, 0, 1);
             for(int i=1; i<args.length(); i++)
                 if (args.elementAt(i) instanceof Box)
                     ret.put(ret.numChildren(), (Box)args.elementAt(i));
@@ -176,11 +168,12 @@ public final class XWT extends JS.Obj {
 
         super.put("sleep", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args != null && (args.length() != 1 || args.elementAt(0) == null)) return null;
-            int i = args == null ? 0 : SpecialBoxProperty.stoi(args.elementAt(0).toString());
+            int i = args == null ? 0 : Box.stoi(args.elementAt(0).toString());
             sleep(i);
             return null;
         }});
 
+        /* FIXME
         super.put("openFile", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1) return null;
             String file = Platform.fileDialog(args.elementAt(0).toString(), false);
@@ -243,7 +236,7 @@ public final class XWT extends JS.Obj {
                 }
             }
         });
-    
+        */    
     super.put("recursivePrintObject", new JS.Callable() { public Object call(JS.Array args) {
         if (args.length() != 1) return null;
         recurse("", "", args.elementAt(0));
@@ -269,7 +262,8 @@ public final class XWT extends JS.Obj {
                 HTTP http = new HTTP(u.toString());
                 if (Main.originAddr == null) {
                     try {
-                        Main.originAddr = InetAddress.getByName(u.getHost());
+                        Main.originHost = u.getHost();
+                        Main.originAddr = InetAddress.getByName(Main.originHost);
                     } 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");
@@ -311,8 +305,8 @@ public final class XWT extends JS.Obj {
 
     super.put("prefetchImage", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
         if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
-        Box.getImage(args.elementAt(0).toString(),
-                     args.length() > 1 && args.elementAt(1) instanceof JS.Callable ? (JS.Callable)args.elementAt(1) : null);
+        ImageDecoder.getImageDecoder(args.elementAt(0).toString(),
+                                     args.length() > 1 && args.elementAt(1) instanceof JS.Callable ? (JS.Callable)args.elementAt(1) : null);
         return null;
     }});
     }
@@ -357,12 +351,35 @@ public final class XWT extends JS.Obj {
             mythread.go.block();
         }
     }
+    
+    private static class XWTMath extends JS.Obj {
+        public XWTMath() {
+            JS gs = new JS.GlobalScope();
+            put("isNaN",gs.get("isNaN"));
+            put("isFinite",gs.get("isFinite"));
+            put("NaN",gs.get("NaN"));
+            put("Infinity",gs.get("Infinity"));
+            setSeal(true);
+        }
+        public Object get(Object key) {
+            Object ret = super.get(key);
+            if(ret == null) ret = JS.Math.get(key);
+            return ret;
+        }
+    }
+    private static class XWTString extends JS.Obj {
+        public XWTString() {
+            JS gs = new JS.GlobalScope();
+            put("parseInt",gs.get("parseInt"));
+            put("parseFloat",gs.get("parseFloat"));
+            put("decodeURI",gs.get("decodeURI"));
+            put("decodeURIComponent",gs.get("decodeURIComponent"));
+            put("encodeURI",gs.get("encodeURI"));
+            put("encodeURIComponent",gs.get("encodeURIComponent"));
+            put("escape",gs.get("escape"));
+            put("unescape",gs.get("unescape"));
+            put("fromCharCode",gs.get("stringFromCharCode"));
+            setSeal(true);
+        }
+    }
 }
-
-
-
-
-
-
-
-