X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=c566a017e142fc0139e8ee55cff33fb6599bfdd8;hb=3c68ab103101636952799709c5a5b635d3cc214b;hp=8b8e2f8a8f0c6f086612994a386b30b4c0e936ad;hpb=07937eca96c0b866462c285a880f364b0cda92bb;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index 8b8e2f8..c566a01 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -6,11 +6,7 @@ package org.xwt; // RULE: coordinates on non-static methods are ALWAYS relative to the // upper-left hand corner of this -// FIXME: align -// FIXME use bitfields -// FIXME fixedaspect -// FIXME: reflow before allowing js to read from width/height -// FIXME: due to font inheritance, we must dirty and mark all null-font descendents of a node if its font changes +// FEATURE: reflow before allowing js to read from width/height // FEATURE: fastpath for rows=1/cols=1 // FEATURE: reflow starting with a certain child // FEATURE: separate mark_for_reflow and mark_for_resize @@ -20,6 +16,7 @@ import java.net.*; import java.util.*; import org.xwt.js.*; import org.xwt.util.*; +import org.xwt.translators.*; /** *

@@ -55,13 +52,14 @@ import org.xwt.util.*; * SizeChanges trigger an Surface.abort; if rendering were done in the same * pass, rendering work done prior to the Surface.abort would be wasted. * - * Repacking is seperate from resizing since a box's size depends on - * both the box's parent's size (so the traversal must be preorder) - * contentwidths of siblings both before and after the box, which in - * turn depend on all descendents of the siblings. FIXME + * The two passes are repack and resize. Together they are known as + * reflow. Repacking assigns boxes to the appropriate grid + * coordinates within the parents and computes + * contentwidth/contentheight. Resize computes actual size and + * position. * * A note on coordinates: the Box class represents regions - * internally as x,y,w,h tuples, even though the DoubleBuffer class + * internally as x,y,w,h tuples, even though the PixelBuffer class * uses x1,y1,x2,y2 tuples. */ public final class Box extends JS.Scope { @@ -71,7 +69,7 @@ public final class Box extends JS.Scope { // Misc instance data //////////////////////////////////////////////////////////////// - private static int sizePosChangesSinceLastRender = 0; + static int sizePosChangesSinceLastRender = 0; // Misc instance data //////////////////////////////////////////////////////////////// @@ -81,10 +79,20 @@ public final class Box extends JS.Scope { //#define MARK_FOR_REFLOW_b for(Box b2 = b; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true; //#define MARK_FOR_REFLOW_b_parent for(Box b2 = b.parent; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true; - private boolean mouseinside = false; Box redirect = this; Surface surface = null; // null on all non-root boxen - Hash traps = null; + + // Flags /////////////////////////////////////////////////////////////////////////////// + short flags = 0; + static int MOUSEINSIDE_FLAG = 0x00000001; + static int INVISIBLE_FLAG = 0x00000002; + static int ABSOLUTE_FLAG = 0x00000004; + static int HSHRINK_FLAG = 0x00000008; + static int VSHRINK_FLAG = 0x00000010; + static int TILE_FLAG = 0x00000020; + static int FONT_CHANGED_FLAG = 0x00000040; // set when font changes, cleared during repack + static int ISROOT_FLAG = 0x00000080; + static int NOCLIP_FLAG = 0x00000100; // Geometry //////////////////////////////////////////////////////////////////////////// @@ -95,64 +103,65 @@ public final class Box extends JS.Scope { //#define MIN_LENGTH Integer.MIN_VALUE // always correct (set directly by user) - LENGTH minwidth = 0; - LENGTH minheight = 0; - LENGTH maxwidth = MAX_LENGTH; - LENGTH maxheight = MAX_LENGTH; + public LENGTH minwidth = 0; + public LENGTH minheight = 0; + public LENGTH maxwidth = MAX_LENGTH; + public LENGTH maxheight = MAX_LENGTH; private LENGTH hpad = 0; private LENGTH vpad = 0; private String text = null; - private String font = null; + private Res font = null; + private int fontsize = 10; private LENGTH textwidth = 0; private LENGTH textheight = 0; - // FIXME: use shorts + // FEATURE: use shorts private int rows = 1; private int cols = 0; private int rowspan = 1; private int colspan = 1; // computed during reflow - LENGTH x = 0; - LENGTH y = 0; + public LENGTH x = 0; + public LENGTH y = 0; public LENGTH width = 0; public LENGTH height = 0; - private int row = 0; // FIXME short - private int col = 0; // FIXME short - private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth) + pad) + private int row = 0; // FEATURE use a short + private int col = 0; // FEATURE use a short + private LENGTH contentwidth = 0; // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad) private LENGTH contentheight = 0; // Rendering Properties /////////////////////////////////////////////////////////// - //private SVG.VP path = null; - //private SVG.Paint fill = null; - //private SVG.Paint stroke = null; + private VectorGraphics.VectorPath path = null; + private VectorGraphics.Affine transform = null; + //private VectorGraphics.Paint fill = null; + //private VectorGraphics.Paint stroke = null; + int strokewidth = 1; - private Picture image; // will disappear - private int fillcolor = 0x00000000; // will become SVG.Paint - private int strokecolor = 0xFF000000; // will become SVG.Paint + public Picture image; // will disappear + private int fillcolor = 0x00000000; // will become VectorGraphics.Paint + private int strokecolor = 0xFF000000; // will become VectorGraphics.Paint private String cursor = null; // the cursor for this box - //FIXME make private - public boolean invisible = false; // true iff the Box is invisible - private boolean absolute = false; // If true, the box will be positioned absolutely - private boolean vshrink = false; // If true, the box will shrink to the smallest vertical size possible - private boolean hshrink = false; // If true, the box will shrink to the smallest horizontal size possible - private boolean tile = false; // FIXME: drop this? // Instance Methods ///////////////////////////////////////////////////////////////////// - // FIXME: rethink /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ - public final void dirty() { dirty(0, 0, width, height); } + public final void dirty() { + if ((flags & NOCLIP_FLAG) != 0 && parent != null) parent.dirty(); + else dirty(0, 0, width, height); + } public final void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.parent) { - w = min(x + w, cur.width) - max(x, 0); - h = min(y + h, cur.height) - max(y, 0); - x = max(x, 0); - y = max(y, 0); + if ((flags & NOCLIP_FLAG) == 0) { + w = min(x + w, cur.width) - max(x, 0); + h = min(y + h, cur.height) - max(y, 0); + x = max(x, 0); + y = max(y, 0); + } if (w <= 0 || h <= 0) return; if (cur.parent == null && cur.surface != null) cur.surface.dirty(x, y, w, h); x += cur.x; @@ -170,16 +179,16 @@ public final class Box extends JS.Scope { void Move(int oldmousex, int oldmousey, int mousex, int mousey) { Move(oldmousex, oldmousey, mousex, mousey, false); } void Move(int oldmousex, int oldmousey, int mousex, int mousey, boolean forceleave) { - boolean wasinside = mouseinside; - boolean isinside = !invisible && inside(mousex, mousey) && !forceleave; - mouseinside = isinside; + boolean wasinside = (flags & MOUSEINSIDE_FLAG) != 0; + boolean isinside = !((flags & INVISIBLE_FLAG) != 0) && inside(mousex, mousey) && !forceleave; + if (isinside) flags |= MOUSEINSIDE_FLAG; else flags &= ~MOUSEINSIDE_FLAG; if (!wasinside && !isinside) return; - if (traps == null) { } - else if (!wasinside && isinside && traps.get("Enter") != null) put("Enter", Boolean.TRUE); - else if (wasinside && !isinside && traps.get("Leave") != null) put("Leave", Boolean.TRUE); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && traps.get("Move") != null) put("Move", Boolean.TRUE); + if (!wasinside && isinside && get("Enter", Trap.class) != null) put("Enter", Boolean.TRUE); + else if (wasinside && !isinside && get("Leave", Trap.class) != null) put("Leave", Boolean.TRUE); + else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && get("Move", Trap.class) != null) + put("Move", Boolean.TRUE); if (isinside && cursor != null) getRoot().cursor = cursor; @@ -195,23 +204,37 @@ public final class Box extends JS.Scope { // Reflow //////////////////////////////////////////////////////////////////////////////////////// - void reflow() { + void reflow() { reflow(width, height); } + void reflow(int new_width, int new_height) { repack(); if (Surface.abort) return; - resize(x, y, width, height); + resize(x, y, new_width, new_height); } /** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */ void repack() { if (!needs_reflow) return; - if (numChildren() == 0) { contentwidth = minwidth; contentheight = minheight; return; } + if (numChildren() == 0) { + contentwidth = max(textwidth + 2 * hpad, minwidth); + contentheight = max(textheight + 2 * vpad, minheight); + if (path != null) { + contentwidth = max(contentwidth, path.boundingBoxWidth()); + contentheight = max(contentheight, path.boundingBoxHeight()); + } + return; + } // --- Phase 0 ---------------------------------------------------------------------- // recurse for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (((flags & FONT_CHANGED_FLAG) != 0) && child.font == null) { + child.flags |= FONT_CHANGED_FLAG; + child.needs_reflow = true; + } child.repack(); if (Surface.abort) { MARK_FOR_REFLOW_this; return; } } + flags &= ~FONT_CHANGED_FLAG; // --- Phase 1 ---------------------------------------------------------------------- // assign children to their row/column positions (assuming constrained columns) @@ -220,7 +243,7 @@ public final class Box extends JS.Scope { if (rows == 0) { int[] numRowsInCol = new int[cols]; // the number of cells occupied in each column Box child = getChild(0); - for(; child != null && (child.absolute || child.invisible); child = child.nextSibling()); + for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling()); OUTER: for(int row=0; child != null; row++) { for(int col=0; child != null && col < cols;) { INNER: while(true) { // scan across the row, looking for an unoccupied gap at least as wide as the child @@ -235,7 +258,7 @@ public final class Box extends JS.Scope { child.row = row; col += min(cols, child.colspan); child = child.nextSibling(); - for(; child != null && (child.absolute || child.invisible); child = child.nextSibling()); + for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling()); } } } @@ -251,24 +274,28 @@ public final class Box extends JS.Scope { numCols = max(numCols, child.col + child.colspan); LENGTH[] colWidth = new LENGTH[numCols]; for(Box child = getChild(0); child != null; child = child.nextSibling()) - if (!(child.absolute || child.invisible)) + if (!(((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0))) colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan); for(int col=0; col 0) while(slack > 0) { @@ -347,18 +374,18 @@ public final class Box extends JS.Scope { // --- Phase 4 ---------------------------------------------------------------------- // assign children's new sizes and positions and recurse for(Box child = getChild(0); child != null; child = child.nextSibling()) { - if (child.invisible) continue; + if ((child.flags & INVISIBLE_FLAG) != 0) continue; int child_x = 0, child_y = 0, child_width = 0, child_height = 0; - if (child.absolute) { + if ((child.flags & ABSOLUTE_FLAG) != 0) { child_x = child.x; child_y = child.y; - child_width = child.hshrink ? child.contentwidth : min(child.maxwidth, width - child.x - hpad); - child_height = child.vshrink ? child.contentheight : min(child.maxheight, height - child.y - vpad); + child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x - hpad); + child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y - vpad); } else { int diff; - //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight hshrink/vshrink marginWidth/marginHeight hpad/vpad child_x/child_y child_width/child_height + //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight hpad/vpad child_x/child_y child_width/child_height child_width = 0; for(int i=child.col; i i) { - for(int j = x + hpad; j < x + hpad + textdim(0); j += 2) - buf.fillRect(j, y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2, - j + 1, y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1, - textcolor); - - } else if (font().lastIndexOf('u') > i) { - buf.fillRect(x + hpad, - y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2, - x + hpad + textdim(0), - y + vpad + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1, - textcolor); + void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) { + for(int i=0; i=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; } static final int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; } - final boolean inside(int x, int y) { return (!invisible && x >= 0 && y >= 0 && x < width && y < height); } + final boolean inside(int x, int y) { return (!((flags & INVISIBLE_FLAG) != 0) && x >= 0 && y >= 0 && x < width && y < height); } /** figures out what box in this subtree of the Box owns the pixel at x,y relitave to the Surface */ public static Box whoIs(Box cur, int x, int y) { @@ -872,7 +829,7 @@ public final class Box extends JS.Scope { // is UNSYNCHRONIZED for performance reasons. BE CAREFUL // HERE. - if (cur.invisible) return null; + if ((cur.flags & INVISIBLE_FLAG) != 0) return null; if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null; OUTER: while(true) { for(int i=cur.numChildren() - 1; i>=0; i--) { @@ -880,7 +837,7 @@ public final class Box extends JS.Scope { if (child == null) continue; // since this method is unsynchronized, we have to double-check globalx += child.x; globaly += child.y; - if (!child.invisible && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } + if (!((child.flags & INVISIBLE_FLAG) != 0) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } globalx -= child.x; globaly -= child.y; } @@ -918,8 +875,8 @@ public final class Box extends JS.Scope { void put(String name, Box b, Object value) { put(b, value); } static { - //#repeat fillcolor/strokecolor - specialBoxProperties.put("fillcolor", new SpecialBoxProperty() { + //#repeat fill/stroke fillcolor/strokecolor + specialBoxProperties.put("fill", new SpecialBoxProperty() { public Object get(Box b) { if ((b.fillcolor & 0xFF000000) == 0) return null; String red = Integer.toHexString((b.fillcolor & 0x00FF0000) >> 16); @@ -944,9 +901,8 @@ public final class Box extends JS.Scope { Log.log(this, "invalid color " + s); return; } - else if (SVG.colors.get(s) != null) - newcolor = 0xFF000000 | ((Integer)SVG.colors.get(s)).intValue(); - // FIXME put named colors back in + else if (org.xwt.translators.SVG.colors.get(s) != null) + newcolor = 0xFF000000 | ((Integer)org.xwt.translators.SVG.colors.get(s)).intValue(); if (newcolor == b.fillcolor) return; b.fillcolor = newcolor; b.dirty(); @@ -955,12 +911,13 @@ public final class Box extends JS.Scope { //#end specialBoxProperties.put("color", new SpecialBoxProperty() { - public Object get(Box b) { return b.get("fillcolor"); } - public void put(Box b, Object value) { b.put("fillcolor", value); } + public Object get(Box b) { return b.get("fill"); } + public void put(Box b, Object value) { b.put("fill", value); } }); + specialBoxProperties.put("textcolor", new SpecialBoxProperty() { - public Object get(Box b) { return b.get("strokecolor"); } - public void put(Box b, Object value) { b.put("strokecolor", value); } + public Object get(Box b) { return b.get("stroke"); } + public void put(Box b, Object value) { b.put("stroke", value); } }); specialBoxProperties.put("text", new SpecialBoxProperty() { @@ -968,13 +925,128 @@ public final class Box extends JS.Scope { public void put(Box b, Object value) { String t = value == null ? "null" : value.toString(); if (t.equals(b.text)) return; - // FIXME text is broken + b.text = t; + if (t == null) { + if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b; + b.textwidth = b.textheight = 0; + } else { + try { + MARK_FOR_REFLOW_b; + b.textwidth = 0; + for(int i=0; i 0) { + if (t.startsWith("skewX(")) { + // FIXME + + } else if (t.startsWith("shear(")) { + // FIXME: nonstandard; remove this + b.transform.multiply(VectorGraphics.Affine.shear(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')'))))); + + } else if (t.startsWith("skewY(")) { + // FIXME + + } else if (t.startsWith("rotate(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') != -1) { + float angle = Float.parseFloat(sub.substring(0, sub.indexOf(','))); + sub = sub.substring(sub.indexOf(',') + 1); + float cx = Float.parseFloat(sub.substring(0, sub.indexOf(','))); + sub = sub.substring(sub.indexOf(',') + 1); + float cy = Float.parseFloat(sub); + b.transform.multiply(VectorGraphics.Affine.translate(cx, cy)); + b.transform.multiply(VectorGraphics.Affine.rotate(angle)); + b.transform.multiply(VectorGraphics.Affine.translate(-1 * cx, -1 * cy)); + } else { + b.transform.multiply(VectorGraphics.Affine.rotate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')'))))); + } + + } else if (t.startsWith("translate(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') > -1) { + b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')'))))); + } else { + b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), 0)); + } + + } else if (t.startsWith("flip(")) { + String which = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + b.transform.multiply(VectorGraphics.Affine.flip(which.equals("horizontal"), which.equals("vertical"))); + + } else if (t.startsWith("scale(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') > -1) { + b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')'))))); + } else { + b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))))); + } + + } else if (t.startsWith("matrix(")) { + // FIXME: is this mapped right? + float d[] = new float[6]; + StringTokenizer st = new StringTokenizer(t, ",", false); + for(int i=0; i<6; i++) + d[i] = Float.parseFloat(st.nextToken()); + b.transform.multiply(new VectorGraphics.Affine(d[0], d[1], d[2], d[3], d[4], d[5])); + } + t = t.substring(t.indexOf(')') + 1).trim(); + } + b.dirty(); + } + public Object get(Box b) { return b.transform.toString(); } + }); + specialBoxProperties.put("font", new SpecialBoxProperty() { public Object get(Box b) { return b.font; } public void put(Box b, Object value) { - b.font = value == null ? null : value.toString(); - //b.fontChanged(); + // FIXME: translate value into a resource if it is a string + b.font = value == null ? null : (Res)value; + MARK_FOR_REFLOW_b; + b.flags |= FONT_CHANGED_FLAG; + b.dirty(); + } }); + + 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); + MARK_FOR_REFLOW_b; + b.flags |= FONT_CHANGED_FLAG; + b.dirty(); + } }); + + specialBoxProperties.put("strokewidth", new SpecialBoxProperty() { + public Object get(Box b) { return new Integer(b.strokewidth); } + public void put(Box b, Object value) { + if (b.strokewidth == stoi(value)) return; + b.strokewidth = stoi(value); b.dirty(); } }); @@ -989,6 +1061,7 @@ public final class Box extends JS.Scope { specialBoxProperties.put("orient", new SpecialBoxProperty() { public Object get(Box b) { + Log.log(this, "warning: the orient property is deprecated"); if (b.redirect == null) return "horizontal"; else if (b.redirect != b) return get(b.redirect); else if (b.cols == 1) return "vertical"; @@ -996,6 +1069,7 @@ public final class Box extends JS.Scope { else return "grid"; } public void put(Box b, Object value) { + Log.log(this, "warning: the orient property is deprecated"); if (value == null) return; if (b.redirect == null) return; if (b.redirect != b) { put(b.redirect, value); return; } @@ -1010,31 +1084,22 @@ public final class Box extends JS.Scope { MARK_FOR_REFLOW_b; } }); + //FIXME specialBoxProperties.put("static", new SpecialBoxProperty() { - public Object get(Box b) { - String cfsn = - JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction().getSourceName(); - for(int i=0; i