2003/12/07 09:57:15

[org.ibex.core.git] / src / org / xwt / Box.java

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 3da445a..06a5e91 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -61,6 +61,32 @@ public final class Box extends JSScope {
 
     static Hash boxToCursor = new Hash(500, 3);
     public static final int MAX_LENGTH = Integer.MAX_VALUE;
+    static final Font DEFAULT_FONT = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10);
+
+    // box properties can not be trapped
+    static final String[] props = new String[] {
+        "fill", "stroke", "image", "tile", "fixedaspect", "text", "path", "font",
+        "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows",
+        "colspan", "rowspan", "align", "invisible", "absolute", "globalx", "globaly",
+        "minwidth", "maxwidth", "minheight", "maxheight",
+        "numchildren", "redirect", "cursor", "mousex", "mousey", "xwt", "static",
+        "mouseinside", "root", "thisbox", "indexof"
+    };
+
+    // events can have write traps, but not read traps
+    static final String[] events = new String[] {
+        "Press1", "Press2", "Press3",
+        "Release1", "Release2", "Release3",
+        "Click1", "Click2", "Click3",
+        "DoubleClick1", "DoubleClick2", "DoubleClick3",
+        "Enter", "Leave", "Move", 
+        "KeyPressed", "KeyReleased", "PosChange", "SizeChange",
+
+        "childadded", "childremoved",
+
+        "Focused", "Maximized", "Minimized", "Close",
+        "icon", "titlebar", "toback", "tofront"
+    };
 
     // Flags //////////////////////////////////////////////////////////////////////
 
@@ -96,7 +122,7 @@ public final class Box extends JSScope {
     int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */;
 
     private String text = null;
-    private Font font = null;
+    private Font font = DEFAULT_FONT; 
     private Picture.Holder texture;
     private short strokewidth = 1;
     private int fillcolor = 0x00000000;
@@ -237,10 +263,10 @@ public final class Box extends JSScope {
             boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
             this.width = width; this.height = height; this.x = x; this.y = y;
             dirty();
-            try { if (sizechange) putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ }
-            catch (Exception e) { Log.log(this, e); }
-            try { if (poschange) putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ }
-            catch (Exception e) { Log.log(this, e); }
+            if (sizechange) try { putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ }
+                catch (Exception e) { Log.log(this, e); }
+            if (poschange) try { putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ }
+                catch (Exception e) { Log.log(this, e); }
         }
     }
 
@@ -334,7 +360,7 @@ public final class Box extends JSScope {
                 for(int y = globaly; y < cy2; y += texture.picture.getHeight())
                     buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2);
 
-       if (text != null && !text.equals("") && font != null)
+        if (text != null && !text.equals("") && font != null)
             if (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1)
                 font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2,
                                     new Scheduler.Task() { public void perform() { Box b = Box.this; MARK_REFLOW_b; dirty(); }});
@@ -363,7 +389,18 @@ public final class Box extends JSScope {
 
     public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); }
 
-    protected boolean isTrappable() { return true; }
+    protected boolean isTrappable(Object key, boolean isRead) {
+        if (key == null) return false;
+        else if (key instanceof String) {
+            // not allowed to trap box properties, and no read traps on events
+            String name = (String)key;
+            for (int i=0; i < props.length; i++) if (name.equals(props[i])) return false; 
+            if (isRead) for (int i=0; i < events.length; i++) if (name.equals(events[i])) return false; 
+        }
+
+        return true;
+    }
+
     public Object get(Object name) throws JSExn {
         if (name instanceof Number)
             return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name);
@@ -461,8 +498,8 @@ public final class Box extends JSScope {
         case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once");
         case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty();
         case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
-        case "x": if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty();
-        case "y": if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty();
+        case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
+        case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
         case "KeyPressed":   return;  // prevent stuff from hitting the Hash
         case "KeyReleased":   return; // prevent stuff from hitting the Hash
         case "PosChange":   return;   // prevent stuff from hitting the Hash