X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTrap.java;h=ea2ea9544fbcf31e73d8f33ddf213fa9e6e60b46;hb=bbfe17b34980e100bcf26ec0c0b1b3fde1992793;hp=c6c6a47bd166b783a8b110c2dd520b877d4275e3;hpb=a81a151e639664cb340cf3726f9e8b9c77d125fb;p=org.ibex.core.git

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index c6c6a47..ea2ea95 100644
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -4,6 +4,7 @@ package org.xwt;
 import java.util.*;
 import org.xwt.js.*;
 import org.xwt.util.*;
+import java.io.*;
 
 /**
  *  This class encapsulates a single trap placed on a given node. The
@@ -15,20 +16,31 @@ public class Trap {
 
     // Static Data //////////////////////////////////////////////////////////////
 
+    private static JS.CompiledFunction cascadeHelper = null;
+    private static String cascadeHelperText =
+        "return function(q) { var ret = arguments.doTrap;" +
+        "if (ret != false && !arguments.didCascade) arguments.cascade = q; };";
+    static {
+        try {
+            cascadeHelper = JS.parse("cascadeHelper", 1, new StringReader(cascadeHelperText));
+            cascadeHelper = (JS.CompiledFunction)new JS.Context(cascadeHelper, null, null).resume(null);
+        } catch (Exception e) {
+            Log.log(Trap.class, e);
+        }
+    }
+
     /** List of properties that cannot be trapped */
     private static final Hash PROHIBITED = new Hash(120, 3);
 
     static {
-        // FIXME: review
         String[] p = new String[] {
-            "sizetoimage", "shrink", "hshrink", "vshrink", "x", "y",
-            "width", "height", "flex", "hflex", "vflex", "cols",
+            "shrink", "hshrink", "vshrink", "x", "y",
+            "width", "height", "flex", "colspan", "rowspan", "cols",
             "rows", "align", "invisible", "absolute", "globalx",
             "globaly", "minwidth", "minheight", "height", "width",
             "maxwidth", "maxheight", "numchildren", "hpad", "vpad",
-            "doublebuffered", "cursor", "mousex", "mousey", "xwt",
-            "static", "mouseinside", "root", "thisbox", "indexof",
-            "path"
+            "buffered", "cursor", "mousex", "mousey",
+            "mouseinside", "thisbox", "indexof", "path", "font", "fontsize"
         };
         for(int i=0; i<p.length; i++) PROHIBITED.put(p[i], Boolean.TRUE);
     };
@@ -64,12 +76,7 @@ public class Trap {
             if (t.f == f) return;
         
         // actually place the trap
-        Trap t = new Trap();
-        t.next = (Trap)trapee.get(name, Trap.class);
-        trapee.put(name, Trap.class, t);
-        t.trapee = trapee;
-        t.name = name;
-        t.f = f;
+        trapee.put2(name, Trap.class, new Trap(trapee, name.toString(), f, (Trap)trapee.get(name, Trap.class)));
     }
 
 
@@ -81,59 +88,64 @@ public class Trap {
      */
     static void delTrap(Box trapee, Object name, JS.CompiledFunction f) {
         Trap t = (Trap)trapee.get(name, Trap.class);
-        if (t.f == f) {
-            trapee.put(name, Trap.class, t.next);
-            return;
-        }
+        if (t.f == f) { trapee.put2(name, Trap.class, t.next); return; }
         for(; t.next != null; t = t.next)
-            if (t.next.f == f) {
-                t.next = t.next.next;
-                return;
-            }
+            if (t.next.f == f) { t.next = t.next.next; return; }
         Log.logJS("warning: tried to remove a trap that had not been placed");
     }
 
 
     // Instance Methods //////////////////////////////////////////////////////////////////////////
 
-    private Trap() { }
+    private Trap(Box b, String n, JS.CompiledFunction f, Trap nx)
+    { trapee = b; name = n; this.f = f; this.next = nx; }
+
+    // Read Traps //////////////////////////////////////////////////////////////////////
 
-    public Object perform() throws JS.Exn {
+    public Object perform() {
         if (f.getNumFormalArgs() > 0) return cascade();
-        return f.call(new TrapArgs(this));
-    }
-    
-    public void perform(Object val) throws JS.Exn {
-        if (f.getNumFormalArgs()== 0) cascade(val);
-        f.call(new TrapArgs(this, val));
+        else return new JS.TailCall().set(f, new TrapArgs(this));
     }
-    
+
     public Object cascade() {
         if (next != null) return next.perform();
-        return trapee.get(name, true);
+        else return trapee.get(name, true);
     }
 
-    public void cascade(Object val) {
-        if (next != null) next.perform(val);
-        trapee.put(name, val, true);
+    // Write Traps //////////////////////////////////////////////////////////////////////
+
+    public Object perform(Object val) {
+        if (f.getNumFormalArgs() == 0) return cascade(val);
+        else return new JS.TailCall().set(cascadeHelper, new TrapArgs(this, val));
     }
+    
+    public Object cascade(Object val) {
+        if (next != null) return next.perform(val);
+        else return trapee.put(name, val, true);
+    }
+
+    // Args ///////////////////////////////////////////////////////////////////////////
 
     private static class TrapArgs extends JS.Array {
         private Trap t;
+        public boolean cascadeHappened = false;
         public TrapArgs(Trap t) { this.t = t; }
         public TrapArgs(Trap t, Object value) { this.t = t; addElement(value); }
         
-        public void put(Object key, Object val) {
-            if (key.equals("cascade")) t.cascade(val);
-            else super.put(key, val);
+        public Object put(Object key, Object val) {
+            if (key.equals("cascade")) { cascadeHappened = true; return t.cascade(val); }
+            else return super.put(key, val);
         }
 
         public Object get(Object key) {
             // common case
             if(!(key instanceof String)) return super.get(key);
             if (key.equals("trapee")) return t.trapee;
+            if (key.equals("doTrap")) return new JS.TailCall().set(t.f, this);
+            if (key.equals("didCascade")) return cascadeHappened ? Boolean.TRUE : Boolean.FALSE;
             if (key.equals("trapname")) return t.name;
             if (key.equals("cascade")) return t.cascade();
+            if (key.equals("callee")) return t.f;
             return super.get(key);
         }
     }