2003/11/13 05:04:21
authormegacz <megacz@xwt.org>
Fri, 30 Jan 2004 07:41:10 +0000 (07:41 +0000)
committermegacz <megacz@xwt.org>
Fri, 30 Jan 2004 07:41:10 +0000 (07:41 +0000)
darcs-hash:20040130074110-2ba56-a3009611f4b90682d2da84b0c9d450ecf7523488.gz

src/org/xwt/BoxTree.java [new file with mode: 0644]
src/org/xwt/Font.java
src/org/xwt/HTTP.java
src/org/xwt/Main.java

diff --git a/src/org/xwt/BoxTree.java b/src/org/xwt/BoxTree.java
new file mode 100644 (file)
index 0000000..ef84541
--- /dev/null
@@ -0,0 +1,426 @@
+// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+package org.xwt;
+import org.xwt.js.*;
+import org.xwt.util.*;
+
+/** all the boxtree manipulation code goes here */
+public final class BoxTree extends Box {
+
+    //#define MARK_REFLOW for(Box b2 = this; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW);
+    //#define MARK_REFLOW_b for(Box b2 = b; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW);
+    //#define MARK_RESIZE for(Box b2 = this; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE);
+    //#define MARK_RESIZE_b for(Box b2 = b; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE);
+
+    private static final boolean RED = false;
+    private static final boolean BLACK = true;
+
+    public final Box peerTree_leftmost() { for (Box p = this; ; p = p.left) if (p.left == null) return p; }
+    public final Box peerTree_rightmost() { for (Box p = this; ; p = p.right) if (p.right == null) return p; }
+    static Box     peerTree_parent(Box p) { return (p == null)? null: p.peerTree_parent; }
+
+    public Box insertBeforeMe(Box cell) { left = cell; cell.peerTree_parent = this; return cell.fixAfterInsertion(); }
+    public Box insertAfterMe(Box cell) { right = cell; cell.peerTree_parent = this; return cell.fixAfterInsertion(); }
+
+    static boolean colorOf(Box p) { return (p == null) ? BLACK : p.test(Box.BLACK); }
+    static void    setColor(Box p, boolean c) { if (p != null) { if (c) p.set(Box.BLACK); else p.clear(Box.BLACK); } }
+    static Box     leftOf(Box p) { return (p == null)? null: p.left; }
+    static Box     rightOf(Box p) { return (p == null)? null: p.right; }
+
+    public final Box nextSibling() {
+        if (right != null)
+            return right.peerTree_leftmost();
+        else {
+            Box p = peerTree_parent;
+            Box ch = this;
+            while (p != null && ch == p.right) { ch = p; p = p.peerTree_parent; }
+            return p;
+        }
+    }
+
+    public final Box prevSibling() {
+        if (left != null)
+            return left.peerTree_rightmost();
+        else {
+            Box p = peerTree_parent;
+            Box ch = this;
+            while (p != null && ch == p.left) { ch = p; p = p.peerTree_parent; }
+            return p;
+        }
+    }
+
+    public Box removeNode() {
+        Box root = peerTree_parent.rootChild;
+
+        // handle case where we are only node
+        if (left == null && right == null && peerTree_parent == null) return null;
+
+        // if strictly internal, swap places with a successor
+        if (left != null && right != null) {
+            Box s = nextSibling();
+            // To work nicely with arbitrary subclasses of Box, we don't want to
+            // just copy successor's fields. since we don't know what
+            // they are.  Instead we swap positions in the tree.
+            root = swapPosition(this, s);
+        }
+
+        // Start fixup at replacement node (normally a child).
+        // But if no children, fake it by using self
+
+        if (left == null && right == null) {
+      
+            if (test(Box.BLACK)) root = this.fixAfterDeletion();
+
+            // Unlink  (Couldn't before since fixAfterDeletion needs peerTree_parent ptr)
+
+            if (peerTree_parent != null) {
+                if (this == peerTree_parent.left) 
+                    peerTree_parent.left = null;
+                else if (this == peerTree_parent.right) 
+                    peerTree_parent.right = null;
+                peerTree_parent = null;
+            }
+
+        }
+        else {
+            Box replacement = left;
+            if  (replacement == null) replacement = right;
+       
+            // link replacement to peerTree_parent 
+            replacement.peerTree_parent = peerTree_parent;
+
+            if (peerTree_parent == null)             root = replacement; 
+            else if (this == peerTree_parent.left)  peerTree_parent.left  = replacement;
+            else                             peerTree_parent.right = replacement;
+
+            left = null;
+            right = null;
+            peerTree_parent = null;
+
+            // fix replacement
+            if (test(Box.BLACK)) root = replacement.fixAfterDeletion();
+      
+        }
+
+        return root;
+    }
+
+    /**
+     * Swap the linkages of two nodes in a tree.
+     * Return new root, in case it changed.
+     **/
+    Box swapPosition(Box x, Box y) {
+        Box root = peerTree_parent.rootChild;
+
+        /* Too messy. TODO: find sequence of assigments that are always OK */
+
+        Box px = x.peerTree_parent; 
+        boolean xpl = px != null && x == px.left;
+        Box lx = x.left;
+        Box rx = x.right;
+
+        Box py = y.peerTree_parent;
+        boolean ypl = py != null && y == py.left;
+        Box ly = y.left;
+        Box ry = y.right;
+
+        if (x == py) {
+            y.peerTree_parent = px;
+            if (px != null) if (xpl) px.left = y; else px.right = y;
+            x.peerTree_parent = y;
+            if (ypl) { 
+                y.left = x; 
+                y.right = rx; if (rx != null) rx.peerTree_parent = y;
+            }
+            else {
+                y.right = x;
+                y.left = lx;   if (lx != null) lx.peerTree_parent = y;
+            }
+            x.left = ly;   if (ly != null) ly.peerTree_parent = x;
+            x.right = ry;  if (ry != null) ry.peerTree_parent = x;
+        }
+        else if (y == px) {
+            x.peerTree_parent = py;
+            if (py != null) if (ypl) py.left = x; else py.right = x;
+            y.peerTree_parent = x;
+            if (xpl) { 
+                x.left = y; 
+                x.right = ry; if (ry != null) ry.peerTree_parent = x;
+            }
+            else {
+                x.right = y;
+                x.left = ly;   if (ly != null) ly.peerTree_parent = x;
+            }
+            y.left = lx;   if (lx != null) lx.peerTree_parent = y;
+            y.right = rx;  if (rx != null) rx.peerTree_parent = y;
+        }
+        else {
+            x.peerTree_parent = py; if (py != null) if (ypl) py.left = x; else py.right = x;
+            x.left = ly;   if (ly != null) ly.peerTree_parent = x;
+            x.right = ry;  if (ry != null) ry.peerTree_parent = x;
+      
+            y.peerTree_parent = px; if (px != null) if (xpl) px.left = y; else px.right = y;
+            y.left = lx;   if (lx != null) lx.peerTree_parent = y;
+            y.right = rx;  if (rx != null) rx.peerTree_parent = y;
+        }
+
+        boolean c = x.test(Box.BLACK);
+        if (y.test(Box.BLACK)) x.set(Box.BLACK); else x.clear(Box.BLACK);
+        if (c) y.set(Box.BLACK); else y.clear(Box.BLACK);
+
+        if (root == x) root = y;
+        else if (root == y) root = x;
+        return parent.rootChild = root;
+    }
+
+    protected final Box rotateLeft() {
+        Box root = parent.rootChild;
+        Box r = right;
+        right = r.left;
+        if (r.left != null) r.left.peerTree_parent = this;
+        r.peerTree_parent = peerTree_parent;
+        if (peerTree_parent == null) root = r;
+        else if (peerTree_parent.left == this) peerTree_parent.left = r;
+        else peerTree_parent.right = r;
+        r.left = this;
+        peerTree_parent = r;
+        return parent.rootChild = root;
+    }
+
+    protected final Box rotateRight() {
+        Box root = parent.rootChild;
+        Box l = left;
+        left = l.right;
+        if (l.right != null) l.right.peerTree_parent = this;
+        l.peerTree_parent = peerTree_parent;
+        if (peerTree_parent == null) root = l;
+        else if (peerTree_parent.right == this) peerTree_parent.right = l;
+        else peerTree_parent.left = l;
+        l.right = this;
+        peerTree_parent = l;
+        return parent.rootChild;
+    }
+
+    protected final Box fixAfterInsertion() {
+        Box root = parent.rootChild;
+        clear(Box.BLACK);
+        Box x = this;
+    
+        while (x != null && x != root && !x.peerTree_parent.test(Box.BLACK)) {
+            if (peerTree_parent(x) == leftOf(peerTree_parent(peerTree_parent(x)))) {
+                Box y = rightOf(peerTree_parent(peerTree_parent(x)));
+                if (colorOf(y) == RED) {
+                    setColor(peerTree_parent(x), BLACK);
+                    setColor(y, BLACK);
+                    setColor(peerTree_parent(peerTree_parent(x)), RED);
+                    x = peerTree_parent(peerTree_parent(x));
+                }
+                else {
+                    if (x == rightOf(peerTree_parent(x))) {
+                        x = peerTree_parent(x);
+                        root = x.rotateLeft();
+                    }
+                    setColor(peerTree_parent(x), BLACK);
+                    setColor(peerTree_parent(peerTree_parent(x)), RED);
+                    if (peerTree_parent(peerTree_parent(x)) != null) 
+                        root = peerTree_parent(peerTree_parent(x)).rotateRight();
+                }
+            }
+            else {
+                Box y = leftOf(peerTree_parent(peerTree_parent(x)));
+                if (colorOf(y) == RED) {
+                    setColor(peerTree_parent(x), BLACK);
+                    setColor(y, BLACK);
+                    setColor(peerTree_parent(peerTree_parent(x)), RED);
+                    x = peerTree_parent(peerTree_parent(x));
+                }
+                else {
+                    if (x == leftOf(peerTree_parent(x))) {
+                        x = peerTree_parent(x);
+                        root = x.rotateRight();
+                    }
+                    setColor(peerTree_parent(x),  BLACK);
+                    setColor(peerTree_parent(peerTree_parent(x)), RED);
+                    if (peerTree_parent(peerTree_parent(x)) != null) 
+                        root = peerTree_parent(peerTree_parent(x)).rotateLeft();
+                }
+            }
+        }
+        root.set(Box.BLACK);
+        return parent.rootChild = root;
+    }
+
+    /** From CLR **/
+    protected final Box fixAfterDeletion() {
+        Box root = peerTree_parent.rootChild;
+        Box x = this;
+        while (x != root && colorOf(x) == BLACK) {
+            if (x == leftOf(peerTree_parent(x))) {
+                Box sib = rightOf(peerTree_parent(x));
+                if (colorOf(sib) == RED) {
+                    setColor(sib, BLACK);
+                    setColor(peerTree_parent(x), RED);
+                    root = peerTree_parent(x).rotateLeft();
+                    sib = rightOf(peerTree_parent(x));
+                }
+                if (colorOf(leftOf(sib)) == BLACK && colorOf(rightOf(sib)) == BLACK) {
+                    setColor(sib,  RED);
+                    x = peerTree_parent(x);
+                }
+                else {
+                    if (colorOf(rightOf(sib)) == BLACK) {
+                        setColor(leftOf(sib), BLACK);
+                        setColor(sib, RED);
+                        root = sib.rotateRight();
+                        sib = rightOf(peerTree_parent(x));
+                    }
+                    setColor(sib, colorOf(peerTree_parent(x)));
+                    setColor(peerTree_parent(x), BLACK);
+                    setColor(rightOf(sib), BLACK);
+                    root = peerTree_parent(x).rotateLeft();
+                    x = root;
+                }
+            }
+            else {
+                Box sib = leftOf(peerTree_parent(x));
+                if (colorOf(sib) == RED) {
+                    setColor(sib, BLACK);
+                    setColor(peerTree_parent(x), RED);
+                    root = peerTree_parent(x).rotateRight();
+                    sib = leftOf(peerTree_parent(x));
+                }
+                if (colorOf(rightOf(sib)) == BLACK && colorOf(leftOf(sib)) == BLACK) {
+                    setColor(sib,  RED);
+                    x = peerTree_parent(x);
+                }
+                else {
+                    if (colorOf(leftOf(sib)) == BLACK) {
+                        setColor(rightOf(sib), BLACK);
+                        setColor(sib, RED);
+                        root = sib.rotateLeft();
+                        sib = leftOf(peerTree_parent(x));
+                    }
+                    setColor(sib, colorOf(peerTree_parent(x)));
+                    setColor(peerTree_parent(x), BLACK);
+                    setColor(leftOf(sib), BLACK);
+                    root = peerTree_parent(x).rotateRight();
+                    x = root;
+                }
+            }
+        }
+        setColor(x, BLACK);
+        return parent.rootChild = root;
+    }
+
+    // Tree Manipulation /////////////////////////////////////////////////////////////////////
+
+    /** remove this node from its parent; INVARIANT: whenever the parent of a node is changed, remove() gets called. */
+    public void remove() {
+        if (parent == null) {
+            Surface surface = Surface.fromBox(this); 
+            if (surface != null) surface.dispose(true);
+            return;
+        } else {
+            parent.numchildren--;
+        }
+        Box oldparent = parent;
+        if (oldparent == null) return;
+        MARK_REFLOW;
+        dirty();
+        clear(MOUSEINSIDE);
+        removeNode();
+        parent = null;
+        if (oldparent != null) { Box b = oldparent; MARK_REFLOW_b; }
+        if (oldparent != null) oldparent.putAndInvokeTraps("childremoved", this);
+    }
+
+    /** Returns ith child */
+    public Box getChild(int i) {
+        // FIXME: store numleft and numright in the tree
+        Box left = rootChild;
+        if (left == null) return null;
+        while (left.left != null) left = left.left;
+        for(; i > 0; i--) left = left.nextSibling();
+        return left;
+    }
+    
+    /** Returns our index in our parent */
+    public int getIndexInParent() {
+        // FIXME: store numleft and numright in the tree
+        if (peerTree_parent == null) return left == null ? 0 : left.numPeerChildren();
+        else if (peerTree_parent.left == this) return peerTree_parent.getIndexInParent() - 1;
+        else if (peerTree_parent.right == this) return peerTree_parent.getIndexInParent() + 1;
+        else throw new Error("we're not a child of our parent!");
+    }
+
+    public int numPeerChildren() {
+        return (left == null ? 0 : left.numPeerChildren() + 1) + (right == null ? 0 : right.numPeerChildren() + 1);
+    }
+
+    /** returns the root of the surface that this box belongs to */
+    public final Box getRoot() {
+        if (parent == null && Surface.fromBox(this) != null) return this;
+        if (parent == null) return null;
+        return parent.getRoot();
+    }
+
+    public void put(int i, Object value) {
+        if (i < 0) return;
+            
+        if (value != null && !(value instanceof Box)) {
+            if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+            return;
+        }
+
+        if (redirect == null) {
+            if (value == null) putAndTriggerTraps("childremoved", getChild(i));
+            else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+
+        } else if (redirect != this) {
+            if (value != null) putAndTriggerTraps("childadded", b);
+            redirect.put(i, value);
+            if (value == null) {
+                Box b = (Box)redirect.get(new Integer(i)) : (Box)value;
+                if (b != null) putAndTriggerTraps("childremoved", b);
+            }
+
+        } else if (value == null) {
+            if (i < 0 || i > numChildren()) return;
+            Box b = getChild(i);
+            b.remove();
+            putAndTriggerTraps("childremoved", b);
+
+        } else {
+            Box b = (Box)value;
+
+            // check if box being moved is currently target of a redirect
+            for(Box cur = b.parent; cur != null; cur = cur.parent)
+                if (cur.redirect == b) {
+                    if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+                    return;
+                }
+
+            // check for recursive ancestor violation
+            for(Box cur = this; cur != null; cur = cur.parent)
+                if (cur == b) {
+                    if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
+                    if (Log.on) Log.log(this, "box == " + this + "  ancestor == " + b);
+                    return;
+                }
+
+            b.remove();
+            b.parent = this;
+            numchildren++;
+
+            Box before = getChild(i);
+            if (before == null) root.peerTree_rightmost().insertAfterMe(b);
+            else before.insertBeforeMe(b);
+            
+            // need both of these in case child was already uncalc'ed
+            MARK_REFLOW_b;
+            MARK_REFLOW;
+            
+            b.dirty();
+            putAndTriggerTraps("childadded", b);
+        }
+    }
+}
index 75bd9c8..2eef1f1 100644 (file)
@@ -8,25 +8,40 @@ import java.io.*;
 
 public class Font {
 
+    private Font(Res res, int pointsize) { this.res = res; this.pointsize = pointsize; }
+
     public final int pointsize;
     public final Res res;
     public int max_ascent;
     public int max_descent;
-    public Glyph[] glyphs = new Glyph[65535];
-    boolean used = false;
+    boolean latinCharsPreloaded = false;        ///< true if a request to preload ASCII 32-127 has begun
+    Glyph[] glyphs = new Glyph[65535];
 
-    private Font(Res res, int pointsize) {
-        this.res = res;
-        this.pointsize = pointsize;
+    public static class Glyph {
+        public Glyph(char c, Font f) { this.c = c; font = f; }
+        public char c;
+        public int baseline;       // within the picture, this is the y-coordinate of the baseline
+        public int advance;        // amount to increment the x-coordinate
+        public Picture p;
+        public final Font font;
     }
 
-    private static Cache fontCache = new Cache();
+
+    // Statics //////////////////////////////////////////////////////////////////////
+
+    private static final Freetype freetype = new Freetype();
+    private static Cache sizeCache = new Cache(100);
+    static final Queue glyphsToBeRendered = new Queue(255);
+    private static Cache fontCache = new Cache(100);
     public static Font getFont(Res res, int pointsize) {
         Font ret = (Font)fontCache.get(res, new Integer(pointsize));
         if (ret == null) fontCache.put(res, new Integer(pointsize), ret = new Font(res, pointsize));
         return ret;
     }
 
+
+    // Methods //////////////////////////////////////////////////////////////////////
+
     /**
      *  If the glyphs of <code>text</code> are not yet loaded, spawn a
      *  Task to load them and invoke callback.
@@ -44,21 +59,19 @@ public class Font {
         for(int i=0; i<text.length(); i++) {
             final char c = text.charAt(i);
             Glyph g = glyphs[c];
-            if (g == null) glyphsToBeRendered.prepend(g = new Glyph(c));
+            if (g == null) glyphsToBeRendered.prepend(g = new Glyph(c, this));    // prepend so they are high priority
             if (g.p == null) {
                 glyphsToBeRendered.prepend(g);
                 encounteredUnrenderedGlyph = true;
             } else if (!encounteredUnrenderedGlyph) {
                 if (pb != null && g.p != null)
-                    pb.drawPictureAlphaOnly(g.p, x + width, y + g.font.max_ascent - g.baseline,
-                                            cx1, cy1, cx2, cy2, textcolor);
+                    pb.drawPictureAlphaOnly(g.p, x + width, y + g.font.max_ascent - g.baseline, cx1, cy1, cx2, cy2, textcolor);
                 width += g.advance;
                 height = java.lang.Math.max(height, max_ascent + max_descent);
             }
         }
         
-        // FIXME: be cleaner here
-        if (encounteredUnrenderedGlyph) Scheduler.add(new Scheduler.Task() { public void perform() {
+        if (encounteredUnrenderedGlyph && callback != null) Scheduler.add(new Scheduler.Task() { public void perform() {
             for(int i=0; i<text.length(); i++) {
                 Glyph g = glyphs[text.charAt(i)];
                 if (g == null || g.p == null) { Scheduler.add(this); return; }
@@ -66,34 +79,28 @@ public class Font {
             callback.perform();
         }});
     
-        if (!used) for(int i=32; i<128; i++) glyphsToBeRendered.append(glyphs[i] = new Glyph((char)i));
-        if (!used || encounteredUnrenderedGlyph) { System.out.println("foo!"); Scheduler.add(glyphRenderingTask); }
-        used = true;
-        return ((long)width << 16) | (long)height;
+        if (!latinCharsPreloaded) for(int i=32; i<128; i++) glyphsToBeRendered.append(glyphs[i] = new Glyph((char)i, this));
+        if (!latinCharsPreloaded || encounteredUnrenderedGlyph) Scheduler.add(glyphRenderingTask);
+        latinCharsPreloaded = true;
+        return encounteredUnrenderedGlyph ? -1 : (((long)width << 16) | (long)height);
     }
 
-
-    public class Glyph {
-        public char c;
-        public int baseline;       // within the picture, this is the y-coordinate of the baseline
-        public int advance;        // amount to increment the x-coordinate
-        public Picture p;
-        public final Font font;
-        public Glyph(char c) { this.c = c; font = Font.this; }
+    public int textwidth(String s) { return (int)(textsize(s) >>> 16L); }
+    public int textheight(String s) { return (int)(textsize(s) & 0xffffffffL); }
+    public long textsize(String s) {
+        Long l = (Long)sizeCache.get(s);
+        if (l != null) return ((Long)l).longValue();
+        long ret = rasterizeGlyphs(s, null, 0, 0, 0, 0, 0, 0, 0, null);
+        if (ret != -1) sizeCache.put(s, new Long(ret));
+        return ret == -1 ? 0 : ret;
     }
 
-    private static final Freetype freetype = new Freetype();
-    static final Queue glyphsToBeRendered = new Queue(255);
     static final Scheduler.Task glyphRenderingTask = new Scheduler.Task() { public void perform() {
         Glyph g = (Glyph)glyphsToBeRendered.remove(false);
         if (g == null) return;
         if (g.p != null) { perform(); return; }
         Log.log(Glyph.class, "rendering glyph " + g.c);
-        try {
-            freetype.renderGlyph(g);
-        } catch (IOException e) {
-            Log.log(Freetype.class, e);
-        }
+        try { freetype.renderGlyph(g); } catch (IOException e) { Log.log(Freetype.class, e); }
         Scheduler.add(this);
     } };
 }
index eca310f..84e5abb 100644 (file)
@@ -276,18 +276,16 @@ public class HTTP {
     }
 
     /** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */
-    public Socket attemptPAC(org.xwt.js.JS.Callable pacFunc) {
+    public Socket attemptPAC(org.xwt.js.JSCallable pacFunc) {
         if (Log.verbose) Log.log(this, "evaluating PAC script");
         String pac = null;
         try {
-            org.xwt.js.JS.Array args = new org.xwt.js.JS.Array();
+            org.xwt.js.JSArray args = new org.xwt.js.JSArray();
             args.addElement(url.toString());
             args.addElement(url.getHost());
-            /* FIXME
             Object obj = pacFunc.call(args);
             if (Log.verbose) Log.log(this, "  PAC script returned \"" + obj + "\"");
             pac = obj.toString();
-            */
         } catch (Throwable e) {
             if (Log.on) Log.log(this, "PAC script threw exception " + e);
             return null;
@@ -358,7 +356,7 @@ public class HTTP {
         OUTER: do {
             if (pi != null) {
                 for(int i=0; i<pi.excluded.length; i++) if (host.equals(pi.excluded[i])) break OUTER;
-                if (sock == null && pi.proxyAutoConfigFunction != null) sock = attemptPAC(pi.proxyAutoConfigFunction);
+                if (sock == null && pi.proxyAutoConfigJSFunction != null) sock = attemptPAC(pi.proxyAutoConfigJSFunction);
                 if (sock == null && ssl && pi.httpsProxyHost != null) sock = attemptHttpProxy(pi.httpsProxyHost, pi.httpsProxyPort);
                 if (sock == null && pi.httpProxyHost != null) sock = attemptHttpProxy(pi.httpProxyHost, pi.httpProxyPort);
                 if (sock == null && pi.socksProxyHost != null) sock = attemptSocksProxy(pi.socksProxyHost, pi.socksProxyPort);
@@ -474,8 +472,8 @@ public class HTTP {
                 if (i+3<type2.length) log += Integer.toString(type2[i+3] & 0xff, 16) + " ";
                 Log.log(this, log);
             }
-            // FIXME: need to keep the connection open between type1 and type3
-            // FIXME: finish this
+            // FEATURE: need to keep the connection open between type1 and type3
+            // FEATURE: finish this
             //byte[] type3 = Proxy.NTLM.getResponse(
             //Proxy.Authorization.authorization2 = "NTLM " + Base64.encode(type3));
         }            
@@ -701,7 +699,7 @@ public class HTTP {
         public String[] excluded = null;
     
         /** the PAC script */
-        public JS.Callable proxyAutoConfigFunction = null;
+        public JSCallable proxyAutoConfigJSFunction = null;
     
         public static Proxy detectProxyViaManual() {
             Proxy ret = new Proxy();
@@ -753,8 +751,8 @@ public class HTTP {
             return ret;
         }
     
-        public static JS.Scope proxyAutoConfigRootScope = new ProxyAutoConfigRootScope();
-        public static JS.Callable getProxyAutoConfigFunction(String url) {
+        public static JSScope proxyAutoConfigRootJSScope = new ProxyAutoConfigRootJSScope();
+        public static JSCallable getProxyAutoConfigJSFunction(String url) {
             try { 
                 BufferedReader br = new BufferedReader(new InputStreamReader(new HTTP(url, true).GET()));
                 String s = null;
@@ -780,18 +778,15 @@ public class HTTP {
                     if (Log.on) Log.log(Proxy.class, script);
                 }
 
-                Function scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
-                // FIXME
-                /*
-                scr.call(new JS.Array(), proxyAutoConfigRootScope);
-                */
-                return (JS.Callable)proxyAutoConfigRootScope.get("FindProxyForURL");
+                JSFunction scr = JS.parse("PAC script at " + url, 0, new StringReader(script));
+                scr.cloneWithNewJSScope(proxyAutoConfigRootJSScope).call(new JSArray());
+                return (JSCallable)proxyAutoConfigRootJSScope.get("FindProxyForURL");
             } catch (Exception e) {
                 if (Log.on) {
                     Log.log(Platform.class, "WPAD detection failed due to:");
                     if (e instanceof JS.Exn) {
                         try {
-                            org.xwt.js.JS.Array arr = new org.xwt.js.JS.Array();
+                            org.xwt.js.JSArray arr = new org.xwt.js.JSArray();
                             arr.addElement(((JS.Exn)e).getObject());
                         } catch (Exception e2) {
                             Log.log(Platform.class, e);
@@ -821,7 +816,6 @@ public class HTTP {
                 if (authorization != oldAuth) return;
                 if (Log.on) Log.log(Authorization.class, "displaying proxy authorization dialog");
                 /*
-                  FIXME
                 Message.Q.add(new Message() {
                         public void perform() {
                             Box b = new Box();
@@ -839,11 +833,11 @@ public class HTTP {
         }
 
 
-        // ProxyAutoConfigRootScope ////////////////////////////////////////////////////////////////////
+        // ProxyAutoConfigRootJSScope ////////////////////////////////////////////////////////////////////
 
-        public static class ProxyAutoConfigRootScope extends JS.GlobalScope {
+        public static class ProxyAutoConfigRootJSScope extends JSScope.Global {
 
-            public ProxyAutoConfigRootScope() { super(null); }
+            public ProxyAutoConfigRootJSScope() { super(null); }
         
             public Object get(Object name) {
                 if (name.equals("isPlainHostName")) return isPlainHostName;
@@ -862,36 +856,36 @@ public class HTTP {
                 else return super.get(name);
             }
         
-            private static final JS.Obj proxyConfigBindings = new JS.Obj();
-            private static final JS.Obj ProxyConfig = new JS.Obj() {
+            private static final JSObj proxyConfigBindings = new JSObj();
+            private static final JSObj ProxyConfig = new JSObj() {
                     public Object get(Object name) {
                         if (name.equals("bindings")) return proxyConfigBindings;
                         return null;
                     }
                 };
         
-            private static final JS.Callable isPlainHostName = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isPlainHostName = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().indexOf('.') == -1) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable dnsDomainIs = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsDomainIs = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().endsWith(args.elementAt(1).toString())) ? Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable localHostOrDomainIs = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable localHostOrDomainIs = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         return (args.elementAt(0).toString().equals(args.elementAt(1).toString()) || 
                                 (args.elementAt(0).toString().indexOf('.') == -1 && args.elementAt(1).toString().startsWith(args.elementAt(0).toString()))) ?
                             Boolean.TRUE : Boolean.FALSE;
                     }
                 };
         
-            private static final JS.Callable isResolvable = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isResolvable = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return (InetAddress.getByName(args.elementAt(0).toString()) != null) ? Boolean.TRUE : Boolean.FALSE;
                         } catch (UnknownHostException e) {
@@ -900,8 +894,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable isInNet = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable isInNet = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         if (args.length() != 3) return Boolean.FALSE;
                         try {
                             byte[] host = InetAddress.getByName(args.elementAt(0).toString()).getAddress();
@@ -918,8 +912,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dnsResolve = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsResolve = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return InetAddress.getByName(args.elementAt(0).toString()).getHostAddress();
                         } catch (UnknownHostException e) {
@@ -928,8 +922,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable myIpAddress = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable myIpAddress = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         try {
                             return InetAddress.getLocalHost().getHostAddress();
                         } catch (UnknownHostException e) {
@@ -939,8 +933,8 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dnsDomainLevels = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dnsDomainLevels = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         String s = args.elementAt(0).toString();
                         int i = 0;
                         while((i = s.indexOf('.', i)) != -1) i++;
@@ -957,8 +951,8 @@ public class HTTP {
                 return false;
             }
         
-            private static final JS.Callable shExpMatch = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable shExpMatch = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         StringTokenizer st = new StringTokenizer(args.elementAt(1).toString(), "*", false);
                         String[] arr = new String[st.countTokens()];
                         String s = args.elementAt(0).toString();
@@ -969,8 +963,8 @@ public class HTTP {
         
             public static String[] days = { "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" };
         
-            private static final JS.Callable weekdayRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable weekdayRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         TimeZone tz = (args.length() < 3 || args.elementAt(2) == null || !args.elementAt(2).equals("GMT")) ? TimeZone.getTimeZone("UTC") : TimeZone.getDefault();
                         Calendar c = new GregorianCalendar();
                         c.setTimeZone(tz);
@@ -995,14 +989,14 @@ public class HTTP {
                     }
                 };
         
-            private static final JS.Callable dateRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable dateRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         throw new JS.Exn("XWT does not support dateRange() in PAC scripts");
                     }
                 };
         
-            private static final JS.Callable timeRange = new JS.Callable() {
-                    public Object call(org.xwt.js.JS.Array args) throws JS.Exn {
+            private static final JSCallable timeRange = new JSCallable() {
+                    public Object call(org.xwt.js.JSArray args) throws JS.Exn {
                         throw new JS.Exn("XWT does not support timeRange() in PAC scripts");
                     }
                 };
@@ -1149,7 +1143,7 @@ public class HTTP {
                 System.arraycopy(highHash, 0, lmHash, 8, 8);
                 return lmHash;
                 */
-                return null; // FIXME
+                return null;
             }
 
             /**
@@ -1215,7 +1209,7 @@ public class HTTP {
                 System.arraycopy(highResponse, 0, lmResponse, 16, 8);
                 return lmResponse;
                 */
-                return null; // FIXME
+                return null;
             }
 
             /**
index 1268fdc..1552c00 100644 (file)
@@ -92,7 +92,7 @@ public class Main {
                 public Object call(Object arg) {
                     scarImage = (Picture)arg;
                     Scheduler.add(new Scheduler.Task() { public void perform() {
-                        Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), null, xwt);
+                        Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new BoxTree(), xwt);
                     } });
                     return null;
                 } });