X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=c5f7a133ef874689e9a86de4fa869142024c4399;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=d7fccf4ebd7411bdbf7084ca3fa0ed9cfa214332;hpb=1d6dcb897564184455e3f826bc787b0d35c7af4e;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index d7fccf4..c5f7a13 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.*;
@@ -7,12 +7,15 @@ import java.text.*;
 import java.util.*;
 import org.xwt.js.*;
 import org.xwt.util.*;
+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 static final XWT singleton = new XWT();
+    public final Res rr;
+    public XWT(Res rr) { this.rr = rr; }
+
     private final JS xwtMath = new XWTMath();
     private final JS xwtString = new XWTString();
 
@@ -21,208 +24,169 @@ public final class XWT extends JS.Obj {
 
     public Object get(Object name) {
         if (name.equals("alt")) return Surface.alt ? Boolean.TRUE : Boolean.FALSE;
+        else if (name.equals("rr")) return rr;
+        else if (name.equals("box")) return new Box();
         else if (name.equals("control")) return Surface.control ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("shift")) return Surface.shift ? Boolean.TRUE : Boolean.FALSE;
         else if (name.equals("clipboard")) return Platform.getClipBoard();
-        else if (name.equals("static")) return Static.getStatic("");
+        else if (name.equals("origin")) return Main.origin;
+        else if (name.equals("maxdim")) return new Integer(Short.MAX_VALUE);
+        else if (name.equals("altKeyName")) return Platform.altKeyName();
+        else if (name.equals("screenWidth")) return new Integer(Platform.getScreenWidth());
+        else if (name.equals("screenHeight")) return new Integer(Platform.getScreenHeight());
+        else if (name.equals("fileSeparator")) return File.separator;
+        else if (name.equals("homeDir")) return System.getProperty("user.home");
+        else if (name.equals("tempDir")) return System.getProperty("java.io.tempdir");
+        else if (name.equals("math")) return xwtMath;
+        else if (name.equals("string")) return xwtString;
+        else if (name.equals("parseInt")) return xwtString.get("parseInt");
+        else if (name.equals("parseFloat")) return xwtString.get("parseFloat");
         else if (name.equals("button")) {
             if (Surface.button1 && !Surface.button2 && !Surface.button3) return new Integer(1);
             else if (!Surface.button1 && Surface.button2 && !Surface.button3) return new Integer(1);
             else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(1);
             else return new Integer(0);
         }
-        else return super.get(name);
+        else return rr.get(name);
     }
 
-    public void put(Object name, Object value) {
-        if (name.equals("thread") && value != null && value instanceof JS.Callable) ThreadMessage.newthread((JS.Callable)value);
-        else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
+    public void put(Object name, final Object value) {
+        if (name.equals("thread") && value != null && (value instanceof JS.Callable || value instanceof JS.CompiledFunction)) {
+            Scheduler.add(new Scheduler.Task() { public Object call(Object arg) {
+                new JS.Thread((CompiledFunction)value).resume();
+                return null;
+            } });
+        } else if (name.equals("clipboard")) Platform.setClipBoard(value.toString());
+        else if (name.equals("frame")) Platform.createSurface((Box)value, true, true);
+        else if (name.equals("window")) Platform.createSurface((Box)value, false, true);
         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);
     }
 
-    private XWT() {
-        super.put("maxdim", new Integer(Short.MAX_VALUE));
-        super.put("origin", Main.origin);
-        super.put("altKeyName", Platform.altKeyName());
-        super.put("screenWidth", new Integer(Platform.getScreenWidth()));
-        super.put("screenHeight", new Integer(Platform.getScreenHeight()));
-        super.put("fileSeparator", File.separator);
-        super.put("homeDir", System.getProperty("user.home"));
-        super.put("tempDir", System.getProperty("java.io.tempdir"));
-        super.put("math", xwtMath);
-        super.put("string", xwtString);
-
-        super.put("newBrowserWindow", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+    public Object callMethod(Object method, JS.Array args, boolean checkOnly) {
+
+        if (method.equals("newBrowserWindow")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1 || args.elementAt(0) == null) return null;
             Platform.newBrowserWindow(args.elementAt(0).toString());
             return null;
-        }});
 
-        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 {
+        } else if (method.equals("clone")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new XWT((Res)args.elementAt(0));
+
+        } else if (method.equals("graft")) {
+            if (checkOnly) return Boolean.TRUE;
+            if (args.elementAt(0) instanceof Box) throw new JS.Exn("can't graft onto Boxes (yet)");
+            if (args.elementAt(0) instanceof Number) throw new JS.Exn("can't graft onto Numbers (yet)");
+            if (args.elementAt(0) instanceof String) throw new JS.Exn("can't graft onto Strings (yet)");
+            if (args.elementAt(0) instanceof Res)
+                return new Res.Graft((Res)args.elementAt(0), args.elementAt(1), args.elementAt(2));
+            return new JS.Graft((JS)args.elementAt(0), args.elementAt(1), args.elementAt(2));
+
+        } else if (method.equals("unzip")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new Res.Zip((Res)args.elementAt(0));
+
+        } else if (method.equals("watchProgress")) {
+            if (checkOnly) return Boolean.TRUE;
+            return new Res.ProgressWatcher((Res)args.elementAt(0), (JS.CompiledFunction)args.elementAt(1));
+
+        } else if (method.equals("yield")) {
+            if (checkOnly) return Boolean.TRUE;
             sleep(0);
             return null;
-        }});
-
-        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;
-                for(int i=1; i<args.length(); i++) {
-                    if (args.elementAt(i) instanceof String) {
-                        String from = (String)args.elementAt(0);
-                        String to = (String)args.elementAt(i);
-                        if (Log.on) Log.log(this, "retheming from " + from + " to " + to);
-                        Resources.mapFrom.addElement(from);
-                        Resources.mapTo.addElement(to);
-                    }
-                }
-                JS.Callable callback = args.elementAt(args.length() - 1) instanceof JS.Callable ?
-                    (JS.Callable)args.elementAt(args.length() - 1) : null;
-                Template.retheme(callback);
-                return null;
-        }});
-            
-        super.put("println", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+
+        } else if (method.equals("load")) {
+            if (checkOnly) return Boolean.TRUE;
+            return Res.stringToRes(args.elementAt(0).toString());
+
+        } else if (method.equals("println")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1) return null;
             if (Log.on) Log.logJS(this, (args.elementAt(0) == null ? "**null**" : args.elementAt(0).toString()));
             return null;
-        }});
 
-        super.put("date", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("date")) {
+            if (checkOnly) return Boolean.TRUE;
             Log.log(XWT.class, "date not implemented");
-            //throw new Error("not implemented");
             return null;
-        }});
 
-        super.put("regexp", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("regexp")) {
+            if (checkOnly) return Boolean.TRUE;
             return new Regexp(args);
-        }});
 
-        super.put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            Object[] fonts = Platform.listFonts();
-            JS.Array ret = new JS.Array();
-            for(int i=0; i<fonts.length; i++) ret.addElement(fonts[i]);
-            return ret;
-        }});
+        } else if (method.equals("apply")) {
+            if (checkOnly) return Boolean.TRUE;
+            Box b = (Box)args.elementAt(0);
+            Template.getTemplate((Res)args.elementAt(1)).apply(b, null, this);
+            return b;
 
-        super.put("xmlrpc", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("xmlrpc")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1 || args.elementAt(0) == null) return null;
             return new XMLRPC(args.elementAt(0).toString(), "");
-        }});
 
-        super.put("soap", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("soap")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() == 1 && args.elementAt(0) != null) return new SOAP(args.elementAt(0).toString(), "", null, null);
             else if (args.length() == 2 && args.elementAt(0) != null && args.elementAt(1) != null)
                 return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), null);
             else if (args.length() == 3 && args.elementAt(0) != null && args.elementAt(1) != null && args.elementAt(2) != null)
                 return new SOAP(args.elementAt(0).toString(), "", args.elementAt(1).toString(), args.elementAt(2).toString());
             else return null;
-        }});
-
-        super.put("textwidth", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args.length() < 1 || args.length() > 2) return null;
-            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));
-        }});
-
-        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());
-        }});
-        
-        super.put("newBox", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args.length() > 0) Log.log(XWT.class, "DEPRECATED: xwt.newBox() with multiple arguments is deprecated; use xwt.newBox().apply()");
-            JS.Callable callback = null;
-            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);
-            for(int i=1; i<args.length(); i++)
-                if (args.elementAt(i) instanceof Box)
-                    ret.put(ret.numChildren(), (Box)args.elementAt(i));
-            for(int i=1; i<args.length(); i++)
-                if (args.elementAt(i) instanceof JS && !(args.elementAt(i) instanceof Box) && !(args.elementAt(i) instanceof JS.Callable)) {
-                    JS s = (JS)args.elementAt(i);
-                    Object[] keys = s.keys();
-                    for(int j=0; j<keys.length; j++) ret.put(keys[j].toString(), s.get(keys[j].toString()));
-                }
-            return ret;
-        }});
 
-        super.put("sleep", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("sleep")) {
+            if (checkOnly) return Boolean.TRUE;
             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;
-        }});
 
-        super.put("openFile", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("openFile")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() != 1) return null;
             String file = Platform.fileDialog(args.elementAt(0).toString(), false);
-            return file == null ? null : new ByteStream(file);
-        }});
+            return file == null ? null : new Res.File(file);
 
-        super.put("saveFile", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("saveFile") || method.equals("saveFileAs")) {
+            if (checkOnly) return Boolean.TRUE;
             if (args.length() != 2) return null;
-            if (!(args.elementAt(1) instanceof ByteStream)) return null;
+            if (!(args.elementAt(1) instanceof Res)) return null;
             String file = args.elementAt(0).toString();
-            if (safeFiles.get(Platform.isCaseSensitive() ? file : file.toLowerCase()) == null) {
+            if (method.equals("saveFileAs") ||
+                safeFiles.get(Platform.isCaseSensitive() ? file : file.toLowerCase()) == null) {
                 file = Platform.fileDialog(file, true);
+                // FIXME: throw exception here
                 if (file == null) return null;
                 safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
             }
             try {
-                ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
-                return null;
-            } catch (IOException e) {
-                if (Log.on) Log.log(ByteStream.class, "IO Exception while writing a ByteStream to a file");
-                if (Log.on) Log.log(ByteStream.class, e);
-                throw new JS.Exn("error while writing a ByteStream to a file");
-            }
-        }});
-
-        super.put("saveFileAs", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args.length() != 2) return null;
-            if (!(args.elementAt(1) instanceof ByteStream)) return null;
-            String file = args.elementAt(0).toString();
-            file = Platform.fileDialog(file, true);
-            if (file == null) return null;
-            safeFiles.put(Platform.isCaseSensitive() ? file : file.toLowerCase(), new Object());
-            try {
-                ((ByteStream)args.elementAt(1)).writeTo(new FileOutputStream(file));
+                InputStream is = ((Res)args.elementAt(1)).getInputStream();
+                FileOutputStream out = new FileOutputStream(file);
+                byte[] buffer = new byte[1024 * 16];
+                while(true) {
+                    int numread = is.read(buffer, 0, buffer.length);
+                    if (numread == -1) break;
+                    out.write(buffer, 0, numread);
+                }
+                is.close();
+                out.close();
                 return null;
             } catch (IOException e) {
-                if (Log.on) Log.log(ByteStream.class, "IO Exception while writing a ByteStream to a file");
-                if (Log.on) Log.log(ByteStream.class, e);
-                throw new JS.Exn("error while writing a ByteStream to a file");
+                if (Log.on) Log.log(XWT.class, "IO Exception while writing a ByteStream to a file");
+                if (Log.on) Log.log(XWT.class, e);
+                throw new JS.Exn("error while writing a Resource to a file");
             }
-        }});
-
-        super.put("utfEncode", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            if (args == null || args.length() != 1) return null;
-            return new ByteStream(args.elementAt(0).toString().getBytes());
-        }});
 
-        super.put("parseHTML", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
+        } else if (method.equals("parseHTML")) {
+            if (checkOnly) return Boolean.TRUE;
                 if (args == null || args.length() != 1 || args.elementAt(0) == null) return null;
                 try {
-                    if (args.elementAt(0) instanceof ByteStream) {
-                        return HTML.parseReader(new InputStreamReader(((ByteStream)args.elementAt(0)).getInputStream()));
+                    if (args.elementAt(0) instanceof Res) {
+                        return HTML.parseReader(new InputStreamReader(((Res)args.elementAt(0)).getInputStream()));
                     } else {
                         return HTML.parseReader(new StringReader(args.elementAt(0).toString()));
                     }
@@ -231,81 +195,16 @@ public final class XWT extends JS.Obj {
                     if (Log.on) Log.log(HTML.class, e);
                     throw new JS.Exn("error while parsing HTML");
                 }
-            }
-        });
-    
-    super.put("recursivePrintObject", new JS.Callable() { public Object call(JS.Array args) {
-        if (args.length() != 1) return null;
-        recurse("", "", args.elementAt(0));
-        return null;
-    }});
 
-    super.put("loadArchive", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-        if (!ThreadMessage.suspendThread()) return null;
-        try {
-            if (args == null || args.length() < 1 || args.elementAt(0) == null) return null;
-            URL u = new URL(args.elementAt(0).toString());
-            
-            JS.Callable callback = null;
-            if (args.length() == 2 && args.elementAt(1) != null && args.elementAt(1) instanceof JS.Callable)
-                callback = (JS.Callable)args.elementAt(1);
-            
-            if (!u.getFile().endsWith(".xwar")) {
-                if (Log.on) Log.log(this, "Error: archive names must end with .xwar: " + u.getFile());
-                throw new JS.Exn("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.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");
-                    }
-                } 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 JS.Exn("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 JS.Exn("unknown protocol \"" + u.getProtocol() + "\"");
-            }
-            
-        } catch (MalformedURLException me) {
-            if (Log.on) Log.log(this, "Malformed URL: " + args.elementAt(0));
-            if (Log.on) Log.log(this, me);
-            throw new JS.Exn(me.toString());
-            
-        } catch (IOException ioe) {
-            if (Log.on) Log.log(this, "IOException while loading archive:");
-            if (Log.on) Log.log(this, ioe);
-            throw new JS.Exn(ioe.toString());
-            
-        } finally {
-            ThreadMessage.resumeThread();
-            
+        } else if (method.equals("recursivePrintObject")) {
+            if (checkOnly) return Boolean.TRUE;
+            if (args.length() != 1) return null;
+            recurse("", "", args.elementAt(0));
+            return null;
         }
+            
+        if (checkOnly) return Boolean.FALSE;
         return null;
-    }});
-
-    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);
-        return null;
-    }});
     }
 
     private static void recurse(String indent, String name, Object o) {
@@ -325,9 +224,10 @@ public final class XWT extends JS.Obj {
             JS s = (JS)o;
             Object[] keys = s.keys();
             for(int i=0; i<keys.length; i++)
-                recurse(indent + "  ", keys[i].toString(),
-                        (keys[i] instanceof Integer) ?
-                        s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
+                if (keys[i] != null)
+                    recurse(indent + "  ", keys[i].toString(),
+                            (keys[i] instanceof Integer) ?
+                            s.get(((Integer)keys[i])) : s.get(keys[i].toString()));
 
         } else {
             Log.logJS(indent + name + o);
@@ -335,21 +235,22 @@ public final class XWT extends JS.Obj {
         }
     }
 
-
-    public static void sleep(int i) {
-        java.lang.Thread thread = java.lang.Thread.currentThread();
-        if (!(thread instanceof ThreadMessage)) {
-            if (Log.on) Log.log(XWT.class, "cannot sleep() or yield() in the foreground thread");
-        } else {
-            ThreadMessage mythread = (ThreadMessage)thread;
-            mythread.done.release();
-            if (i > 0) try { java.lang.Thread.sleep(i); } catch (Exception e) { }
-            MessageQueue.add(mythread);
-            mythread.go.block();
-        }
+    public static void sleep(final int i) {
+        final JS.Thread jsthread = JS.Thread.current();
+        final long currentTime = System.currentTimeMillis();
+        final Scheduler.Task task = new Scheduler.Task() { public Object call(Object arg) {
+            if (System.currentTimeMillis() - currentTime < i) {
+                Scheduler.add(this);
+            } else {
+                jsthread.resume();
+            }
+            return null;
+        } };
+        jsthread.pause();
+        Scheduler.add(task);
     }
     
-    private static class XWTMath extends JS.Obj {
+    private static class XWTMath extends org.xwt.js.Math {
         public XWTMath() {
             JS gs = new JS.GlobalScope();
             put("isNaN",gs.get("isNaN"));
@@ -373,6 +274,8 @@ public final class XWT extends JS.Obj {
             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);
         }