X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=5187dc053d9410172c44c1936eb6e63c7ea38271;hb=e1bf2123524ba1cc258188314733f62c2bf45c00;hp=3da445a86b5ffecfddef6c40a5edac73739a1d69;hpb=bc6ac951869686b84803f45f549ccb888a9f776c;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 3da445a..5187dc0 100644
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -39,7 +39,7 @@ import org.xwt.translators.*;
  *  SizeChanges trigger an Surface.abort; if rendering were done in the same
  *  pass, rendering work done prior to the Surface.abort would be wasted.
  */
-public final class Box extends JSScope {
+public final class Box extends JSScope implements Scheduler.Task {
 
     // Macros //////////////////////////////////////////////////////////////////////
 
@@ -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,8 +122,8 @@ public final class Box extends JSScope {
     int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */;
 
     private String text = null;
-    private Font font = null;
-    private Picture.Holder texture;
+    private Font font = DEFAULT_FONT; 
+    private Picture texture;
     private short strokewidth = 1;
     private int fillcolor = 0x00000000;
     private int strokecolor = 0xFF000000;
@@ -131,6 +157,15 @@ public final class Box extends JSScope {
 
     // Instance Methods /////////////////////////////////////////////////////////////////////
 
+
+    /** invoked when a resource needed to render ourselves finishes loading */
+    public void perform() {
+        MARK_REPACK;
+        MARK_REFLOW;
+        MARK_RESIZE;
+        dirty();
+    }
+
     public Box getRoot() { return parent == null ? this : parent.getRoot(); }
     public Surface getSurface() { return Surface.fromBox(getRoot()); }
 
@@ -231,17 +266,18 @@ public final class Box extends JSScope {
     
     private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
         // FEATURE reimplement, but we're destroying this
-        if (x != this.x || y != this.y || width != this.width || height != this.height) {
+        // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345
+        //if (x != this.x || y != this.y || width != this.width || height != this.height) {
             (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
             boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
             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); }
+            //}
     }
 
     private void resize_children() {
@@ -329,15 +365,14 @@ public final class Box extends JSScope {
         if ((fillcolor & 0xFF000000) != 0x00000000)
             buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor);
 
-        if (texture != null && texture.picture != null)
-            for(int x = globalx; x < cx2; x += texture.picture.getWidth())
-                for(int y = globaly; y < cy2; y += texture.picture.getHeight())
-                    buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2);
+        if (texture != null && texture.isLoaded)
+            for(int x = globalx; x < cx2; x += texture.width)
+                for(int y = globaly; y < cy2; y += texture.height)
+                    buf.drawPicture(texture, 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(); }});
+                font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this);
 
         for(Box b = getChild(0); b != null; b = b.nextSibling())
             b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null);
@@ -363,7 +398,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);
@@ -423,8 +469,8 @@ public final class Box extends JSScope {
         case "shrink": put("hshrink", value); put("vshrink", value);
         case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE;
         case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE;
-        case "width": if (parent==null&&Surface.fromBox(this)!=null) { CHECKSET_INT(width); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; }
-        case "height": if (parent == null&&Surface.fromBox(this)!=null) { CHECKSET_INT(height); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; }
+        case "width": if (parent==null&&Surface.fromBox(this)!=null) { Surface.fromBox(this).setWidth(toInt(value)); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; }
+        case "height": if (parent == null&&Surface.fromBox(this)!=null) { Surface.fromBox(this).setHeight(toInt(value)); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; }
         case "maxwidth": CHECKSET_INT(maxwidth); MARK_RESIZE;
         case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE;
         case "maxheight": CHECKSET_INT(maxheight); MARK_RESIZE;
@@ -461,20 +507,15 @@ 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
         case "SizeChange":   return;  // prevent stuff from hitting the Hash
         case "childadded":   return;  // prevent stuff from hitting the Hash
         case "childremoved": return;  // prevent stuff from hitting the Hash
-        case "thisbox": {
-            if (value != null) break;
-            if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
-            Surface surface = Surface.fromBox(this); 
-            if (surface != null) surface.dispose(true);
-        }
+        case "thisbox": if (value == null) removeSelf();
         default: super.put(name, value);
         //#end
     }
@@ -531,17 +572,21 @@ public final class Box extends JSScope {
             return;
         }
         if (!(value instanceof Res)) return;
-        texture = Picture.fromRes((Res)value, null);
-        if (texture != null) {
-            minwidth = texture.picture.getWidth();
-            minheight = texture.picture.getHeight();
+
+
+        // FIXME
+        texture = Picture.load((Res)value, this);
+        if (texture.isLoaded) {
+            minwidth = texture.width;
+            minheight = texture.height;
             MARK_REFLOW;
             dirty();
             return;
         }
-        texture = Picture.fromRes((Res)value, new Scheduler.Task() { public void perform() {
-            minwidth = texture.picture.getWidth();
-            minheight = texture.picture.getHeight();
+        texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() {
+            // FIXME pass this instead of a new Task?
+            minwidth = texture.width;
+            minheight = texture.height;
             Box b = Box.this; MARK_REFLOW_b;
             dirty();
         } });
@@ -646,6 +691,12 @@ public final class Box extends JSScope {
 
     // Tree Manipulation /////////////////////////////////////////////////////////////////////
 
+    void removeSelf() {
+        if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
+        Surface surface = Surface.fromBox(this); 
+        if (surface != null) surface.dispose(true);
+    }
+
     /** remove the i^th child */
     public void removeChild(int i) {
         Box b = getChild(i);