X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2FBox.java.pp;h=c58eebc04b2d338634e0d78d782cfb01a7126ac8;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=21cc5bff5c8437aaa4906e06033c943a03e506d7;hpb=16ea48d834626fb9815da2f7632c3633838fb790;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 21cc5bf..c58eebc 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;
@@ -436,6 +435,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 +450,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 buf.drawPicture(image, globalx, globaly, clipx, clipy, clipx + clipw, clipy + cliph);
+            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(""))
-            renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+            Glyph.rasterizeGlyphs(font, fontsize, text, buf, textcolor, globalx, globaly, clipx, clipy, clipw + clipx, clipy + cliph,
+                                  new Callback() { public Object call(Object arg) {
+                                      Box.this.dirty();
+                                      Box b = Box.this;
+                                      MARK_FOR_REFLOW_b;
+                                      b.dirty();
+                                      return null;
+                                  }});
 
         if (path != null) {
             if (rtransform == null) rpath = null;
@@ -480,57 +488,6 @@ public final class Box extends JS.Scope {
         }
     }
 
-    void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, PixelBuffer buf) {
-        /*
-          FIXME
-        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++) {
-            final char c = text.charAt(i);
-	    Glyph g = Glyph.getCachedGlyph(font, fontsize, c);
-	    if (g != null) {
-		int top = y + g.max_ascent - g.baseline + g.max_descent;
-		if (g.p != null)
-		    buf.drawPictureAlphaOnly(g.p, x, top,
-					     clipx, clipy, clipx + clipw, clipy + cliph, textcolor);
-		x += g.advance;
-	    } else {
-		final int fontsize_final = fontsize;
-		final Res font_final = font;
-                ThreadMessage.newthread(new JS.Callable() {
-                        public Object call(JS.Array args) {
-			    Glyph.renderGlyph(font_final, fontsize_final, c);	
-			    recompute_font();
-			    Box b = Box.this; MARK_FOR_REFLOW_b;
-			    dirty();
-			    return null;
-			} });
-		return;
-	    }
-        }
-    }
-
 
     // Methods to implement org.xwt.js.JS //////////////////////////////////////
 
@@ -850,37 +807,24 @@ 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.getCachedGlyph(font, fontsize, text.charAt(i));
-		if (g == null) {
-		    final int fontsize_final = fontsize;
-		    final Res font_final = font;
-		    final char c = text.charAt(i);
-		    ThreadMessage.newthread(new JS.Callable() {
-			    public Object call(JS.Array args) {
-				Glyph.renderGlyph(font_final, fontsize_final, c);	
-				recompute_font();
-				Box b = Box.this; MARK_FOR_REFLOW_b;
-				dirty();
-				return null;
-			    } });
-		} else {
-		    textwidth += g.advance;
-		    textheight = max(textheight, g.max_ascent + g.max_descent);
-		}
-            }
-        } catch (Exception e) {
-            Log.log(this, e);
-        }
+        if (text == null) { textwidth = textheight = 0; return; }
+        if (font == null) { /* FIXME */ }
+        long widthheight = Glyph.rasterizeGlyphs(font, fontsize, text, null, textcolor, 0, 0, 0, 0, 0, 0,
+                                                 new Callback() { public Object call(Object arg) {
+                                                     Box b = Box.this;
+                                                     recompute_font();
+                                                     MARK_FOR_REFLOW_b;
+                                                     b.dirty();
+                                                     return null;
+                                                 } });
+        if (widthheight == -1) return;
+        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; }
@@ -951,15 +895,17 @@ public final class Box extends JS.Scope {
 
         static {
             specialBoxProperties.put("fill", new ColorBoxProperty() {
-                    public void put(Box b, Object value) {
-                        if (value != null && value instanceof Res) {
-                            b.image = Picture.fromRes((Res)value);
+                    public void put(final Box b, final Object value) {
+                        if (value == null || !(value instanceof Res)) super.put(b, value);
+                        else Picture.fromRes((Res)value, new Callback() { public Object call(Object pic) {
+                            if (pic == b.image) return null;
+                            b.image = (Picture)pic;
                             b.minwidth = b.image.getWidth();
                             b.minheight = b.image.getHeight();
+                            MARK_FOR_REFLOW_b;
                             b.dirty();
-                        } else {
-                            super.put(b, value);
-                        }
+                            return null;
+                        } });
                     }
                     public int getColor(Box b) { return b.fillcolor; }
                     public void putColor(Box b, int argb) { b.fillcolor = argb; }
@@ -979,13 +925,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() {
@@ -1239,14 +1180,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) {
@@ -1283,23 +1216,6 @@ public final class Box extends JS.Scope {
                         if (b.parent != null) MARK_FOR_REFLOW_b_parent;
                     } });
         
-            specialBoxProperties.put("image", new SpecialBoxProperty() {
-                    public Object get(Box b) { return b.image == null ? null : b.image.res; }
-                    public void put(Box b, Object value) {
-                        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); }