X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FTrap.java;h=196c445472c11d86d6bb7f8e15925e141ca13b3f;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=8d9404e92a61336f0aad8662673d23d633ce1137;hpb=e58686eae8a823ed64ed0ec92c2274c41d90ec93;p=org.ibex.core.git

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index 8d9404e..196c445 100644
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.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.util.*;
@@ -15,51 +15,36 @@ public class Trap {
 
     // Static Data //////////////////////////////////////////////////////////////
 
-    /** a vector of weak references to all instances of Trap; used for retheming */
-    private static Hashtable allTraps = new Hashtable(1000);
-
     /** List of properties that cannot be trapped */
     private static final Hash PROHIBITED = new Hash(120, 3);
 
     static {
         String[] p = new String[] {
-            "sizetoimage", "shrink", "hshrink", "vshrink", "x", "y", "width", "height",
-            "flex", "align", "invisible", "absolute", "globalx", "globaly",
-            "minwidth", "minheight", "height", "width", "maxwidth", "maxheight", 
-            "numchildren", "hpad", "vpad", "doublebuffered", "cursor",
-            "mousex", "mousey", "xwt", "static", "mouseinside", "root", "thisbox", "indexof", "svg"
+            "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",
+            "buffered", "cursor", "mousex", "mousey",
+            "mouseinside", "thisbox", "indexof", "path", "font", "fontsize"
         };
         for(int i=0; i<p.length; i++) PROHIBITED.put(p[i], Boolean.TRUE);
     };
 
-    private static Object dummy = new Object();
-
 
     // Instance Members ////////////////////////////////////////////////////////
 
     /** the box on which this trap was placed */
     private Box trapee = null;
 
-    /** If this trap was actually placed on a root proxy, this is a reference to the proxy */
-    private JS rp = null;
-    
     /** the function for this trap */
-    JS.Function f = null;
-
-    /** the name of the property that this trap was placed on */
-    private String name = null;
+    JS.CompiledFunction f = null;
 
     /** the next trap down the trap stack */
     private Trap next = null;
 
-    /** true if this is a read-trap */
-    boolean isreadtrap = false;
-
-    /** The nodeName of the Template whose script placed the trap. See Template.nodeName for more detail. */
-    private String placerNodeName = null;
-
-    /** our weak reference in the allTraps Hash */
-    private Weak myWeak = Platform.getWeak(this);
+    /** the property that the trap was placed on */
+    private Object name = null;
 
 
     // Static Methods //////////////////////////////////////////////////////////////////////////
@@ -69,176 +54,86 @@ public class Trap {
      *  @param trapee the box to place the trap on
      *  @param name the name of the property to trap on
      *  @param f the function to place as a trap
-     *  @param isreadtrap true iff this is a read (double-underscore) trap
-     *  @param rp if this trap is being placed via a rootproxy, this is that proxy object.
      */
-    static void addTrap(Box trapee, String name, JS.Function f, boolean isreadtrap, JS rp) {
-
-        if (PROHIBITED.get(name) != null || name.startsWith("xwt_")) {
-            Log.log(Trap.class, "Error: you cannot place traps on special property \"" + name + "\"");
-            return;
-        }
-
-        // find out what script is currently running
-        String placerNodeName = JS.getCurrentFunctionSourceName();
+    static void addTrap(Box trapee, Object name, JS.CompiledFunction f) {
 
         // check if this script has already placed a trap on this property
-        if (trapee.traps == null) trapee.traps = new Hash(10, 3);
-        for(Trap t = (Trap)trapee.traps.get(name); t != null; t = t.next) if (t.placerNodeName.equals(placerNodeName)) return;
+        for(Trap t = (Trap)trapee.get(name, Trap.class); t != null; t = t.next)
+            if (t.f == f) return;
         
         // actually place the trap
         Trap t = new Trap();
-        t.next = (Trap)trapee.traps.get(name);
-        trapee.traps.put(name, t);
+        t.next = (Trap)trapee.get(name, Trap.class);
+        trapee.put(name, Trap.class, t);
         t.trapee = trapee;
-        t.f = f;
-        t.placerNodeName = placerNodeName;
-        t.rp = rp;
         t.name = name;
-        t.isreadtrap = isreadtrap;
-
-        // make sure that the surface knows when we place traps on these two properties (slightly inelegant)
-        if (trapee.surface != null && (name.equals("KeyPressed") || name.equals("KeyReleased"))) {
-            trapee.surface.keywatchers.removeElement(trapee);
-            trapee.surface.keywatchers.addElement(trapee);
-        }
+        t.f = f;
     }
 
-    /** returns the function placed as a trap on property <code>name</code> of box <code>b</code> by the currently-running script */
-    public static Trap getTrap(Box b, String name) {
-        if (b.traps == null) return null;
-
-        String currentFunctionNodeName = JS.getCurrentFunctionSourceName();
-        for(Trap cur = (Trap)b.traps.get(name); cur != null; cur = cur.next)
-            if (cur.placerNodeName.equals(currentFunctionNodeName))
-                return cur;
 
-        return null;
-    }
-
-    /** Called by Rhino's arguments.cascade. Note: cx will be null if this was invoked from perform() rather than from a script. */
-    public static final CascadeFunction cascadeFunction = new CascadeFunction();
-    private static class CascadeFunction extends JS.Function {
-        CascadeFunction() { setSeal(true); }
-        public Object _call(JS.Array args) { return _call(args, JS.getCurrentFunction()); }
-        public Object _call(JS.Array args, Function currentFunction) {
-            Trap currentTrap = TrapContext.get().currentTrap;
-	    /*
-            if (currentTrap == null || (currentFunction != currentTrap.f)) {
-                if (Log.on) Log.log(this, "attempt to cascade() by a function that was not invoked as a trap at " +
-				    currentFunction.getSourceName());
-                if (Log.on) Log.log(this, "currentfunction == " + currentFunction);
-                if (Log.on) Log.log(this, "currentTrap.f == " + currentTrap.f);
-                return null;
-            }
-	    */
-            if (args.length() != 0) TrapContext.get().putCascadeHappened = true;
-            Trap t = currentTrap.next;
-            // if we've hit the end of the trap stack, just do a put(,,,true)
-            if (t == null) {
-                if (args.length() == 0) return currentTrap.trapee.get(currentTrap.name, true);
-                currentTrap.trapee.put(currentTrap.name, args.elementAt(0), true);
-                return null;
-            }
-            return t.perform(args);
+    /**
+     *  deletes a trap.
+     *  @param trapee the box to remove the trap from
+     *  @param name the name of the property to trap on
+     *  @param f the function to remove
+     */
+    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;
         }
-    };
-
-    /** called by Rhino's arguments.trapee hack */
-    public static Object currentTrapee() {
-        Trap current = TrapContext.get().currentTrap;
-        if (current == null) return null;
-        else if (current.rp != null) return current.rp;
-        else return current.trapee;
-    }
-
-    /** called by Rhino's arguments.trapname hack */
-    public static String currentTrapname() {
-        Trap current = TrapContext.get().currentTrap;
-        if (current == null) return null;
-        else return current.name;
+        for(; t.next != null; t = t.next)
+            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() { allTraps.put(myWeak, dummy); }
-
-    /** perform this trap -- arg.length == 0 if this is a get; otherwise it contains a single element to be put */
-    public Object perform(JS.Array args) {
-        TrapContext tc = TrapContext.get();
+    private Trap() { }
 
-        // save both thread-locals on the stack and update their values
-        Trap save_currentTrap = tc.currentTrap;
-        tc.currentTrap = this;
-
-        boolean save_putCascadeHappened = tc.putCascadeHappened; 
-        tc.putCascadeHappened = false;
-
-        // invoke the trap function
-        try {
-            if (!isreadtrap && args.length() == 0) return cascadeFunction._call(args, f);
-
-            if (f == null) {
-                if (Log.verbose) Log.log(this, "debug: reclaimed a dangling trap on property " + name);
-                Object ret = cascadeFunction._call(args, f);
-                delete();
-                return ret;
-            }
-            
-            Object ret = f._call(args);
-            
-            // autocascade if required
-            if (args.length() > 0 && !isreadtrap && !tc.putCascadeHappened) cascadeFunction._call(args, f);
-            
-            return ret;
-
-        } catch (JS.Exn e) {
-	    if (Log.on) Log.log(this, e);
-
-        } finally {
-            // restore the thread-locals
-            tc.putCascadeHappened = save_putCascadeHappened;
-            tc.currentTrap = save_currentTrap;
-            tc.trapDepth--;
-        }
-        return null;
+    public Object perform() throws JS.Exn {
+        if (f.getNumFormalArgs() > 0) return cascade();
+        return f.call(new TrapArgs(this));
     }
-
-    /** removes this trap */
-    public void delete() {
-        for(Trap last = null, cur = (Trap)trapee.traps.get(name); cur != null; last = cur, cur = cur.next) {
-            if (cur != this) continue;
-            else if (last != null) last.next = cur.next;
-            else if (cur.next == null) trapee.traps.remove(name);
-            else trapee.traps.put(name, cur.next);
-        }
-        if (trapee.surface != null && !trapee.is_trapped("KeyPressed") && !trapee.is_trapped("KeyReleased"))
-            trapee.surface.keywatchers.removeElement(trapee);
-        allTraps.remove(myWeak);
+    
+    public void perform(Object val) throws JS.Exn {
+        if (f.getNumFormalArgs()== 0) cascade(val);
+        f.call(new TrapArgs(this, val));
+    }
+    
+    public Object cascade() {
+        if (next != null) return next.perform();
+        return trapee.get(name, true);
     }
 
-    /** per-thread storage for Traps */
-    private static class TrapContext {
-
-        private static Hash trapContextByThread = new Hash();
-        private TrapContext() { }
-
-        private boolean putCascadeHappened = false;
-        private Trap currentTrap = null;
-        private int trapDepth = 0;
+    public void cascade(Object val) {
+        if (next != null) next.perform(val);
+        trapee.put(name, val, true);
+    }
 
-        /** returns the TrapContext for the current thread */
-        static TrapContext get() {
-            TrapContext ret = (TrapContext)trapContextByThread.get(Thread.currentThread());
-            if (ret == null) {
-                ret = new TrapContext();
-                trapContextByThread.put(Thread.currentThread(), ret);
-            }
-            return ret;
+    private static class TrapArgs extends JS.Array {
+        private Trap t;
+        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 get(Object key) {
+            // common case
+            if(!(key instanceof String)) return super.get(key);
+            if (key.equals("trapee")) return t.trapee;
+            if (key.equals("trapname")) return t.name;
+            if (key.equals("cascade")) return t.cascade();
+            return super.get(key);
+        }
     }
-
 }