X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=473d049d3999c4cc836f181c3e974b105603b069;hb=b205a30ca1e66d49676d807969dd73da999c26f0;hp=04a0ee28baad1a8815a579aeb40ac8679955a805;hpb=4963611978625d087561f5a669a0ba93a04bd1ba;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 04a0ee2..473d049 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -89,7 +89,6 @@ public final class Box extends JS.Scope {
     static final int NOTPACKED_FLAG    = 0x00000004;
     static final int HSHRINK_FLAG      = 0x00000008;
     static final int VSHRINK_FLAG      = 0x00000010;
-    static final int TILE_FLAG         = 0x00000020;
     static final int FONT_CHANGED_FLAG = 0x00000040;  // set when font changes, cleared during repack
     static final int ISROOT_FLAG       = 0x00000080;
     static final int NOCLIP_FLAG       = 0x00000100;
@@ -113,8 +112,7 @@ public final class Box extends JS.Scope {
     public LENGTH maxwidth = MAX_LENGTH;
     public LENGTH maxheight = MAX_LENGTH;
     private String text = null;
-    private Res font = null;
-    private int fontsize = 10;
+    private Font font = null;
     private LENGTH textwidth = 0;
     private LENGTH textheight = 0;
 
@@ -436,6 +434,7 @@ public final class Box extends JS.Scope {
         int globaly = parenty + (parent == null ? 0 : y);
 
         // intersect the x,y,w,h rendering window with ourselves; quit if it's empty
+
         if ((flags & NOCLIP_FLAG) == 0) {
             clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
             cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
@@ -450,11 +449,19 @@ public final class Box extends JS.Scope {
         }
 
         if (image != null)
-            if ((flags & TILE_FLAG) != 0) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
-            else renderStretchedImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
-
-	if (text != null && !text.equals(""))
-            renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+            for(int x = globalx; x < clipx + clipw; x += image.getWidth())
+                for(int y = globaly; y < clipy + cliph; y += image.getHeight())
+                    buf.drawPicture(image, x, y, clipx, clipy, clipx + clipw, clipy + cliph);
+
+	if (text != null && !text.equals("") && font != null) // FIXME
+            font.rasterizeGlyphs(text, buf, textcolor,
+                                 globalx, globaly, clipx, clipy, clipw + clipx, clipy + cliph,
+                                 new Scheduler.Task() { public void perform() {
+                                     Box.this.dirty();
+                                     Box b = Box.this;
+                                     MARK_FOR_REFLOW_b;
+                                     b.dirty();
+                                 }});
 
         if (path != null) {
             if (rtransform == null) rpath = null;
@@ -480,51 +487,6 @@ public final class Box extends JS.Scope {
         }
     }
 
-    void renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
-        // FIXME: wrong
-        buf.drawPicture(image, clipx, clipy, clipx + clipw, clipy + cliph, 0, 0, image.getWidth(), image.getHeight());
-    }
-
-    void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, PixelBuffer buf) {
-        int iw = image.getWidth();
-        int ih = image.getHeight();
-        for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
-            for(int j=(y - y)/ih; j<= (y + h - y)/ih; j++) {
-                
-                int dx1 = max(i * iw + x, x);
-                int dy1 = max(j * ih + y, y);
-                int dx2 = min((i+1) * iw + x, x + w);
-                int dy2 = min((j+1) * ih + y, y + h);
-                
-                int sx1 = dx1 - (i*iw) - x;
-                int sy1 = dy1 - (j*ih) - y;
-                int sx2 = dx2 - (i*iw) - x;
-                int sy2 = dy2 - (j*ih) - y;
-
-                if (dx2 - dx1 > 0 && dy2 - dy1 > 0 && sx2 - sx1 > 0 && sy2 - sy1 > 0)
-                    buf.drawPicture(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
-            }
-        }
-    }
-
-    void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
-        for(int i=0; i<text.length(); i++) {
-            // FIXME: clipping
-            char c = text.charAt(i);
-            Glyph g = Glyph.getGlyph(font, fontsize, c);
-            if (g.p != null)
-                buf.drawPictureAlphaOnly(g.p,
-                                         x,
-                                         y + g.max_ascent - g.baseline - g.max_descent,
-                                         x + g.p.getWidth(),
-                                         y + g.max_ascent - g.baseline + g.p.getHeight() - g.max_descent,
-                                         0, 0,
-                                         g.p.getWidth(), g.p.getHeight(),
-                                         textcolor);
-            x += g.advance;
-        }
-    }
-
 
     // Methods to implement org.xwt.js.JS //////////////////////////////////////
 
@@ -555,27 +517,28 @@ public final class Box extends JS.Scope {
      *  INVARIANT: after completion, getChild(min(i, numChildren())) == newnode
      *  WARNING: O(n) runtime, unless i == numChildren()
      */
-    public void put(int i, Object value) {
-        if (i < 0) return;
+    public Object put(int i, Object value) {
+        if (i < 0) return null;
         Trap t = value == null ? (Trap)get("childremoved", Trap.class) : (Trap)get("childadded", Trap.class);
             
         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;
+            return null;
         }
 
         if (redirect == null) {
-            if (t != null) t.perform(value);
+            if (t != null) return t.perform(value);
             else if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
         } else if (redirect != this) {
             Box b = value == null ? (Box)redirect.get(i) : (Box)value;
+            // FIXME: what if both of them want a tailcall?
             redirect.put(i, value);
-            if (t != null) t.perform(value);
+            if (t != null) return t.perform(value);
         } else if (value == null) {
             if (i >= 0 && i < numChildren()) {
                 Box b = getChild(i);
                 b.remove();
-                if (t != null) t.perform(b);
+                if (t != null) return t.perform(b);
             }
         } else {
             Box newnode = (Box)value;
@@ -584,7 +547,7 @@ public final class Box extends JS.Scope {
             for(Box cur = newnode.parent; cur != null; cur = cur.parent)
                 if (cur.redirect == newnode) {
                     if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
-                    return;
+                    return null;
                 }
 
             // check for recursive ancestor violation
@@ -592,7 +555,7 @@ public final class Box extends JS.Scope {
                 if (cur == newnode) {
                     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 == " + newnode);
-                    return;
+                    return null;
                 }
 
             if (numKids > 15 && children == null) convert_to_array();
@@ -637,12 +600,13 @@ public final class Box extends JS.Scope {
             MARK_FOR_REFLOW_this;
             
             newnode.dirty();
-            if (t != null) t.perform(b);
+            if (t != null) return t.perform(b);
         }
+        return null;
     }
     
     public Object get(Object key, Object key2) { return super.get(key, key2); }
-    public void put(Object key, Object key2, Object val) { super.put(key, key2, val); }
+    public void put2(Object key, Object key2, Object val) { super.put2(key, key2, val); }
 
     public Object get_(Object name) { return super.get(name); }
     public Object get(Object name) { return get(name, false); }
@@ -655,7 +619,7 @@ public final class Box extends JS.Scope {
 
         // See if we're triggering a trap
         Trap t = ignoretraps ? (Trap)null : (Trap)get(name, Trap.class);
-        if (t != null) return t.perform();
+        if (t != null) { t.perform(); return null; }
 
         // Check for a special handler
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
@@ -684,23 +648,20 @@ public final class Box extends JS.Scope {
      *  @param rp if this put is being performed via a root proxy, rp is the root proxy.
      */
     public void put_(Object name, Object value) { super.put(name, value); }
-    public void put(Object name, Object value) { put(name, value, false); }
-    public void put(Object name_, Object value, boolean ignoretraps) {
-        if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; }
-        if (!(name_ instanceof String)) { super.put(name_,value); return; }
+    public Object put(Object name, Object value) { return put(name, value, false); }
+    public Object put(Object name_, Object value,  boolean ignoretraps) {
+        if (name_ instanceof Number) { return put(((Number)name_).intValue(), value); }
+        if (!(name_ instanceof String)) { return super.put(name_,value); }
         String name = name_.toString();
         if (!ignoretraps) {
             Trap t = (Trap)get(name, Trap.class);
-            if (t != null) {
-                t.perform(value);
-                return;
-            }
+            if (t != null) return t.perform(value);
         }
 
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
-        if (gph != null) { gph.put(name, this, value); return; }
+        if (gph != null) { gph.put(name, this, value); return null; }
 
-        super.put(name, value);
+        return super.put(name, value);
     }
 
 
@@ -766,7 +727,9 @@ public final class Box extends JS.Scope {
         // note that JavaScript box[0] will invoke put(int i), not put(String s)
         if (oldparent != null) {
             Trap t = (Trap)oldparent.get("childremoved", Trap.class);
-            if (t != null) t.perform(this);
+
+            // FIXME!!
+            //if (t != null) t.perform(this, tail);
         }
     }
 
@@ -844,23 +807,22 @@ public final class Box extends JS.Scope {
     }
 
     public void recompute_font() {
-        try {
-            MARK_FOR_REFLOW_this;
-            textwidth = 0;
-            textheight = 0;
-            if (text == null) return;
-            for(int i=0; i<text.length(); i++) {
-                Glyph g = Glyph.getGlyph(font, fontsize, text.charAt(i));
-                textwidth += g.advance;
-                textheight = g.max_ascent;
-            }
-        } catch (Exception e) {
-            Log.log(this, e);
-        }
+        if (text == null) { textwidth = textheight = 0; return; }
+        if (font == null) { /* FIXME */ return; }
+        long widthheight = font.rasterizeGlyphs(text, null, textcolor, 0, 0, 0, 0, 0, 0,
+                                                new Scheduler.Task() { public void perform() {
+                                                    Box b = Box.this;
+                                                    recompute_font();
+                                                    MARK_FOR_REFLOW_b;
+                                                    b.dirty();
+                                                } });
+        textwidth = (int)((widthheight & 0xffff0000) >> 16);
+        textheight = (int)(widthheight & 0x0000ffff);
+        MARK_FOR_REFLOW_this;
     }
 
 
-    // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
+    // Trivial Helper Method s(should be inlined) /////////////////////////////////////////
 
     static final int min(int a, int b) { if (a<b) return a; else return b; }
     static final float min(float a, float b) { if (a<b) return a; else return b; }
@@ -931,6 +893,21 @@ public final class Box extends JS.Scope {
 
         static {
             specialBoxProperties.put("fill", new ColorBoxProperty() {
+                    public void put(final Box b, final Object value) {
+                        if (value == null || !(value instanceof Res)) super.put(b, value);
+                        else {
+                            Callback callback = new Callback() { public Object call(Object pic) {
+                                b.image = (Picture)pic;
+                                b.minwidth = b.image.getWidth();
+                                b.minheight = b.image.getHeight();
+                                MARK_FOR_REFLOW_b;
+                                b.dirty();
+                                return null;
+                            } };
+                            Picture pic = Picture.fromRes((Res)value, callback);
+                            if (pic != null) callback.call(pic);
+                        }
+                    }
                     public int getColor(Box b) { return b.fillcolor; }
                     public void putColor(Box b, int argb) { b.fillcolor = argb; }
                 });
@@ -949,13 +926,8 @@ public final class Box extends JS.Scope {
                         String t = value == null ? "null" : value.toString();
                         if (t.equals(b.text)) return;
 			b.text = t;
-			if (t == null) {
-                            if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b;
-			    b.textwidth = b.textheight = 0;
-			} else {
-                            b.recompute_font();
-			}
 			b.dirty();
+                        b.recompute_font();
                     } });
 
             specialBoxProperties.put("path", new SpecialBoxProperty() {
@@ -1040,7 +1012,8 @@ public final class Box extends JS.Scope {
                     public Object get(Box b) { return b.font; }
                     public void put(Box b, Object value) {
                         // FIXME: translate value into a resource if it is a string
-                        b.font = value == null ? null : (Res)value;
+                        b.font = value == null ? null :
+                            Font.getFont((Res)value, b.font == null ? 10 : b.font.pointsize); // FIXME
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
@@ -1050,8 +1023,9 @@ public final class Box extends JS.Scope {
             specialBoxProperties.put("fontsize", new SpecialBoxProperty() {
                     public Object get(Box b) { return b.font; }
                     public void put(Box b, Object value) {
-                        if (b.fontsize == stoi(value)) return;
-                        b.fontsize = stoi(value);
+                        if (b.font != null && b.font.pointsize == stoi(value)) return;
+                        b.font = value == null ? null :
+                            Font.getFont(b.font == null ? null : b.font.res, stoi(value)); // FIXME
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
@@ -1101,7 +1075,6 @@ public final class Box extends JS.Scope {
                     public Object get(Box b) { return b; }
                     public void put(Box b, Object value) {
                         if (value == null) b.remove();
-                        else if (value.equals("window") || value.equals("frame")) Platform.createSurface(b, value.equals("frame"), true);
                         else if (Log.on) Log.log(this, "put invalid value to 'thisbox' property: " + value);
                     }
                 });
@@ -1156,7 +1129,7 @@ public final class Box extends JS.Scope {
                         return new Integer(b.x);
                     }
                     public void put(Box b, Object value) {
-                        if (!((b.flags & NOTPACKED_FLAG) != 0)) return;
+                        if (!((b.flags & NOTPACKED_FLAG) != 0) && (b.parent != null || b.surface == null)) return;
                         int x = stoi(value);
                         if (x == b.x) return;
                         b.dirty();
@@ -1168,17 +1141,20 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            //#repeat width/height minwidth/minheight maxwidth/maxheight
+            //#repeat width/height height/width minwidth/minheight maxwidth/maxheight true/false
             specialBoxProperties.put("width", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.width); }
                     public void put(Box b, Object value) {
-                        b.width = stoi(value);
+                        int newval = stoi(value);
                         if (b.parent == null && b.surface != null) {
-                            b.surface.setSize();
+                            // hack to circumvent #repeat
+                            int other = b.height;
+                            if (true) b.surface.setSize(newval, other);
+                            else b.surface.setSize(other, newval);
                             MARK_FOR_REFLOW_b;
                         } else {
-                            if (b.minwidth == b.width && b.maxwidth == b.width) return;
-                            b.minwidth = b.maxwidth = b.width;
+                            if (b.minwidth == newval && b.maxwidth == newval) return;
+                            b.minwidth = b.maxwidth = newval;
                             MARK_FOR_REFLOW_b;
                         }
                     } });
@@ -1207,14 +1183,6 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            specialBoxProperties.put("tile", new SpecialBoxProperty() {
-                    public Object get(Box b) { return ((b.flags & TILE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
-                    public void put(Box b, Object value) {
-                        if (((b.flags & TILE_FLAG) != 0) == stob(value)) return;
-                        if (stob(value)) b.flags |= TILE_FLAG; else b.flags &= ~TILE_FLAG;
-                        b.dirty();
-                    } });
-        
             specialBoxProperties.put("noclip", new SpecialBoxProperty() {
                     public Object get(Box b) { return ((b.flags & NOCLIP_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
                     public void put(Box b, Object value) {
@@ -1251,26 +1219,6 @@ public final class Box extends JS.Scope {
                         if (b.parent != null) MARK_FOR_REFLOW_b_parent;
                     } });
         
-            specialBoxProperties.put("image", new SpecialBoxProperty() {
-                    /* FIXME
-                    public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); }
-                    */
-                    public void put(Box b, Object value) {
-                        //if (image != null) System.out.println("hit");
-                        if (value == null) {
-                            b.image = null;
-                        } else if (value instanceof Res) {
-                            b.image = Picture.fromRes((Res)value);
-                        } else {
-                            // FIXME
-                        }
-                        b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
-                        b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
-                        MARK_FOR_REFLOW_b;
-                        b.dirty();
-                    }
-                });
-
             //#repeat globalx/globaly x/y
             specialBoxProperties.put("globalx", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.parent == null || b.surface == null ? 0 : b.x); }