From: megacz Date: Fri, 30 Jan 2004 07:41:09 +0000 (+0000) Subject: 2003/11/13 05:04:20 X-Git-Tag: RC3~362 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=04739ad4085fdc3989ceaebc890649d1568063a2 2003/11/13 05:04:20 darcs-hash:20040130074109-2ba56-2ecf150756dd2dc0130c302ec05be07c20ef88c8.gz --- diff --git a/Makefile b/Makefile index ece0998..a461981 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java ./.jikes $< # this forces a clean build every time because jikes is so damn buggy +preprocess: $(all_java_sources) compile: .compile .compile: $(all_java_sources) .jikes @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" @@ -321,4 +322,4 @@ dist-private: test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar #test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar -oldcompile: ; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java` +oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java` diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 9d03fbf..475b380 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -1,15 +1,14 @@ // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; -// **** This file must be preprocessed before compilation **** - -// RULE: coordinates on non-static methods are ALWAYS relative to the -// upper-left hand corner of this - // 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: mark to reflow starting with a certain child // FEATURE: separate mark_for_reflow and mark_for_resize +// FEATURE: make all methods final +// FEATURE: use a linked list for the "frontier" when packing +// FEATURE: or else have a way to mark a column "same as last one"? +// FEATURE: reintroduce surface.abort import java.io.*; import java.net.*; @@ -24,186 +23,153 @@ import org.xwt.translators.*; * rendering logic. *

* - *

- * This is the real meat of XWT. Part of its monolithic design is for - * performance reasons: deep inheritance heirarchies are slow, and - * neither javago nor GCJ can inline across class boundaries. - *

- * - *

The rendering process consists of three phases; each requires + *

The rendering process consists of four phases; each requires * one DFS pass over the tree

- * *
  1. repacking: children of a box are packed into columns * and rows according to their colspan/rowspan attributes and - * ordering. Minimum and maximum sizes of columns are computed. - * + * ordering. + *
    1. reconstraining: Minimum and maximum sizes of columns are computed. *
    2. resizing: width/height and x/y positions of children - * are assigned. If a PosChange or SizeChange is triggered, - * Surface.abort will be set and the resizing process will - * Surface.abort. - * - *
    3. repainting: children draw their content onto the - * buffer. + * are assigned, and PosChange/SizeChanges are triggered. + *
    4. repainting: children draw their content onto the PixelBuffer. *
    * - * The first two passes together are called the reflow phase. - * + * The first three passes together are called the reflow phase. * Reflowing is done in a seperate pass since PosChanges and * SizeChanges trigger an Surface.abort; if rendering were done in the same * pass, rendering work done prior to the Surface.abort would be wasted. - * - * 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 PixelBuffer class - * uses x1,y1,x2,y2 tuples. */ -public final class Box extends JS.Scope { - - public Box() { super(null); } - - - // Misc instance data //////////////////////////////////////////////////////////////// - - static int sizePosChangesSinceLastRender = 0; +public abstract class Box extends JSScope implements JSTrap.JSTrappable { + // Macros ////////////////////////////////////////////////////////////////////// - // Misc instance data //////////////////////////////////////////////////////////////// - - boolean needs_reflow = true; - //#define MARK_FOR_REFLOW_this for(Box b2 = this; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true; - //#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; - - Box redirect = this; - Surface surface = null; // null on all non-root boxen - - // Flags /////////////////////////////////////////////////////////////////////////////// - short flags = 0; - static final int MOUSEINSIDE_FLAG = 0x00000001; - static final int INVISIBLE_FLAG = 0x00000002; - static final int NOTPACKED_FLAG = 0x00000004; - static final int HSHRINK_FLAG = 0x00000008; - static final int VSHRINK_FLAG = 0x00000010; - 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; - static final int ALIGN_TOP_FLAG = 0x00001000; - static final int ALIGN_BOTTOM_FLAG = 0x00002000; - static final int ALIGN_LEFT_FLAG = 0x00004000; - static final int ALIGN_RIGHT_FLAG = 0x00008000; - static final int ALIGN_FLAGS = 0x0000f000; - - - // Geometry //////////////////////////////////////////////////////////////////////////// - - // xwt can be compiled with 16-bit lengths to save memory on small devices //#define LENGTH int - //#define MAX_LENGTH Integer.MAX_VALUE - //#define MIN_LENGTH Integer.MIN_VALUE - - // always correct (set directly by user) - public LENGTH minwidth = 0; - public LENGTH minheight = 0; - public LENGTH maxwidth = MAX_LENGTH; - public LENGTH maxheight = MAX_LENGTH; + //#define MARK_REPACK for(Box b2 = this; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); + //#define MARK_REPACK_b for(Box b2 = b; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); + //#define MARK_REPACK_parent for(Box b2 = parent; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); + //#define MARK_REFLOW for(Box b2 = this; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW); + //#define MARK_REFLOW_b for(Box b2 = b; b2 != null && !b2.test(REFLOW); b2 = b2.parent) b2.set(REFLOW); + //#define MARK_RESIZE for(Box b2 = this; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE); + //#define MARK_RESIZE_b for(Box b2 = b; b2 != null && !b2.test(RESIZE); b2 = b2.parent) b2.set(RESIZE); + //#define CHECKSET_SHORT(prop) short nu = (short)toInt(value); if (nu == prop) break; prop = nu; + //#define CHECKSET_INT(prop) int nu = toInt(value); if (nu == prop) break; prop = nu; + //#define CHECKSET_FLAG(flag) boolean nu = toBoolean(value); if (nu == test(flag)) break; if (nu) set(flag); else clear(flag); + //#define CHECKSET_BOOLEAN(prop) boolean nu = toBoolean(value); if (nu == prop) break; prop = nu; + //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&value.equals(prop))) break; prop=(String)value; + + protected Box() { super(null); } + + static Hash boxToCursor = new Hash(500, 3); + public static final int MAX_LENGTH = Integer.MAX_VALUE; + + // Flags ////////////////////////////////////////////////////////////////////// + + static final int MOUSEINSIDE = 0x00000001; + static final int VISIBLE = 0x00000002; + static final int PACKED = 0x00000004; + static final int HSHRINK = 0x00000008; + static final int VSHRINK = 0x00000010; + static final int BLACK = 0x00000020; // for red-black code + + static final int FIXED = 0x00000040; + static final boolean ROWS = true; + static final boolean COLS = false; + + static final int ISROOT = 0x00000080; + static final int REPACK = 0x00000100; + static final int REFLOW = 0x00000200; + static final int RESIZE = 0x00000400; + static final int RECONSTRAIN = 0x00000800; + static final int ALIGN_TOP = 0x00001000; + static final int ALIGN_BOTTOM = 0x00002000; + static final int ALIGN_LEFT = 0x00004000; + static final int ALIGN_RIGHT = 0x00008000; + static final int ALIGNS = 0x0000f000; + static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues? + static final int NOCLIP = 0x00020000; + + + // Instance Data ////////////////////////////////////////////////////////////////////// + + Box parent = null; + Box redirect = this; + int flags = VISIBLE | PACKED; + private String text = null; private Font font = null; - private LENGTH textwidth = 0; - private LENGTH textheight = 0; - - // FEATURE: use shorts - private int rows = 1; - private int cols = 0; - private int rowspan = 1; - private int colspan = 1; + private Picture texture; + private short strokewidth = 1; + private int fillcolor = 0x00000000; + private int strokecolor = 0xFF000000; + + // specified directly by user + public LENGTH minwidth = 0; + public LENGTH maxwidth = 0; + public LENGTH minheight = 0; + public LENGTH maxheight = 0; + private short rows = 1; + private short cols = 0; + private short rowspan = 1; + private short colspan = 1; // computed during reflow + private short row = 0; + private short col = 0; public LENGTH x = 0; public LENGTH y = 0; public LENGTH width = 0; public LENGTH height = 0; - private int row = 0; // FEATURE use a short - private int col = 0; // FEATURE use a short - private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth)) + private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth)) private LENGTH contentheight = 0; - private LENGTH offset_x = 0; - private LENGTH offset_y = 0; - - - // Rendering Properties /////////////////////////////////////////////////////////// + /* private VectorGraphics.VectorPath path = null; private VectorGraphics.Affine transform = null; - private VectorGraphics.RasterPath rpath = null; private VectorGraphics.Affine rtransform = null; - - //private VectorGraphics.Paint fill = null; - //private VectorGraphics.Paint stroke = null; - int strokewidth = 1; - - public Picture image; // will disappear - private int fillcolor = 0x00000000; // will become VectorGraphics.Paint - private int strokecolor = 0xFF000000; // will become VectorGraphics.Paint - private int textcolor = 0xFF000000; // will become VectorGraphics.Paint - - private String cursor = null; // the cursor for this box - + */ // Instance Methods ///////////////////////////////////////////////////////////////////// + public Box getRoot() { return parent == null ? this : parent.getRoot(); } + public Surface getSurface() { return Surface.fromBox(getRoot()); } + + // FEATURE: use cx2/cy2 format /** 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() { - if ((flags & NOCLIP_FLAG) != 0 && parent != null) parent.dirty(); - else dirty(0, 0, width, height); - } + public final void dirty() { 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) { - if ((flags & NOCLIP_FLAG) == 0) { + if (!cur.test(NOCLIP)) { 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); + if (cur.parent == null && cur.getSurface() != null) cur.getSurface().dirty(x, y, w, h); x += cur.x; y += cur.y; } } - /** - * Given an old and new mouse position, this will update mouseinside and check - * to see if this node requires any Enter, Leave, or Move notifications. - * - * @param forceleave set to true by the box's parent if the mouse is inside an older - * sibling, which is covering up this box. - */ + public void putAndTriggerTraps(Object key, Object value) { + // FIXME + } + + /** update MOUSEINSIDE, check for Enter/Leave/Move */ 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 = (flags & MOUSEINSIDE_FLAG) != 0; - boolean isinside = !((flags & INVISIBLE_FLAG) != 0) && inside(mousex, mousey) && !forceleave; - if (isinside) flags |= MOUSEINSIDE_FLAG; else flags &= ~MOUSEINSIDE_FLAG; - + boolean wasinside = test(MOUSEINSIDE); + boolean isinside = test(VISIBLE) && inside(mousex, mousey) && !forceleave; + if (isinside) set(MOUSEINSIDE); else clear(MOUSEINSIDE); if (!wasinside && !isinside) return; - - 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; - - // if the mouse has moved into our padding region, it is considered 'outside' all our children - if (!(mousex >= 0 && mousey >= 0 && mousex < width && mousey < height)) forceleave = true; - - for(Box b = getChild(numChildren() - 1); b != null; b = b.prevSibling()) { + + if (isinside && test(CURSOR)) getRoot().cursor = (String)boxToCursor.get(this); + if (!wasinside && isinside && getTrap("Enter") != null) putAndTriggerJSTraps("Enter", T); + else if (wasinside && !isinside && getTrap("Leave") != null) putAndTriggerJSTraps("Leave", T); + else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && getTrap("Move")!= null) + putAndTriggerJSTraps("Move", T); + for(Box b = getChild(numchildren - 1); b != null; b = b.prevSibling()) { b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave); if (b.inside(mousex - b.x, mousey - b.y)) forceleave = true; } @@ -212,628 +178,392 @@ public final class Box extends JS.Scope { // Reflow //////////////////////////////////////////////////////////////////////////////////////// + // static stuff so we don't have to keep reallocating + private static int[] numRowsInCol = new int[65535]; + private LENGTH[] colWidth = new LENGTH[65535]; + private LENGTH[] colMaxWidth = new LENGTH[65535]; + private LENGTH[] rowHeight = new LENGTH[65535]; + private LENGTH[] rowMaxHeight = new LENGTH[65535]; + + final Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } + final Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } + /** only for use on the root box */ - void reflow() { reflow(width, height); } void reflow(int new_width, int new_height) { repack(); - if (Surface.abort) return; - //#repeat width/height new_width/new_height HSHRINK_FLAG/VSHRINK_FLAG contentwidth/contentheight minwidth/minheight maxwidth/maxheight - new_width = bound(max(contentwidth, minwidth), - new_width, - ((flags & HSHRINK_FLAG) != 0) ? max(contentwidth, minwidth) : maxwidth); - //#end + new_width = bound(max(contentwidth, minwidth), new_width, test(HSHRINK) ? max(contentwidth, minwidth) : maxwidth); + new_height = bound(max(contentheight, minheight), new_height, test(VSHRINK) ? max(contentheight, minheight) : maxheight); 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 */ + /** pack the boxes into rows and columns; also computes contentwidth */ void repack() { - if (!needs_reflow) return; - contentwidth = contentheight = 0; - - // --- 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) - if ((rows == 0 && cols == 0) || (rows != 0 && cols != 0)) throw new Error("rows == " + rows + " cols == " + cols); - //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2 - if (rows == 0 && numChildren() != 0) { - int[] numRowsInCol = new int[cols]; // the number of cells occupied in each column - Box child = getChild(0); - for(; child != null && (((child.flags & NOTPACKED_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 - while(col < cols && numRowsInCol[col] > row) col++; - for(int i=col; i < cols && i < col + min(cols, child.colspan); i++) - if (numRowsInCol[col] > row) { col = i + 1; continue INNER; } - break; - } - if (col + min(cols, child.colspan) > cols) break; - for(int i=col; i < col + min(cols, child.colspan); i++) numRowsInCol[i] += child.rowspan; - child.col = col; - child.row = row; - col += min(cols, child.colspan); - child = child.nextSibling(); - for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling()); + for(Box child = getChild(0); child != null; child = child.nextSibling()) child.repack(); + + //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan + if (test(FIXED) == COLS) { + short r = 0; short rows = 0; + for(Box child = firstPackedChild(); child != null; r++) + for(short col=0, numclear=0; child != null && col < cols;) { + if (numRowsInCol[col] > r) continue; + if (col != 0 && col + min(cols, child.colspan) > cols) break; + if (++numclear < min(cols, child.colspan)) continue; + for(int i=col - numclear + 1; i <= col; i++) numRowsInCol[i] += child.rowspan; + child.col = col; child.row = r; + child = child.nextPackedSibling(); + rows = (short)max(rows, child.row + child.rowspan); } - } + for(int i=0; i 0) resize_children(); + } - // --- short circuit ---------------------------------------------------------------- - if (!needs_reflow) return; - needs_reflow = false; - if (numChildren() == 0) return; - - // --- Phase 2 ---------------------------------------------------------------------- - // compute the min/max sizes of the columns and rows and set initial width/height to minimums - - //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight marginWidth/marginHeight numCols/numRows - int numCols = cols; - if (numCols == 0) - for(Box child = getChild(0); child != null; child = child.nextSibling()) - numCols = max(numCols, child.col + child.colspan); - LENGTH[] colWidth = new LENGTH[numCols]; - LENGTH[] colMaxWidth = new LENGTH[numCols]; - int marginWidth = width; - for(int i=0; i 0 && startslack != slack;) { + int increment = max(1, slack / cols); + startslack = slack; + for(short col=0; col < cols && slack > 0; col++) { + int diff = min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col]; + slack -= diff; + colWidth[col] += diff; + } + } + + for(Box child = getChild(0); child != null; child = child.nextPackedSibling()) { + int unbounded = 0; + for(int i = child.col; i < child.col + child.colspan; i++) unbounded += colWidth[i]; + child.width = bound(child.contentwidth, unbounded, child.test(HSHRINK) ? child.contentwidth : child.maxwidth); + child.x = test(ALIGN_RIGHT) ? slack : test(ALIGN_LEFT) ? slack / 2 : 0; + for(int i=0; i < child.col; i++) child.x += colWidth[i]; + if (child.width < unbounded) child.x += (child.width - unbounded) / 2; } - //#end - - // --- Phase 3 ---------------------------------------------------------------------- - // hand out the slack - int slack; - //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows - slack = width; - for(int i=0; i 0) - while(slack > 0) { - // FEATURE: inefficient - int startslack = slack; - int increment = max(1, slack / numCols); - for(int col=0; col < numCols && slack > 0; col++) { - slack += colWidth[col]; - colWidth[col] = min(colMaxWidth[col], colWidth[col] + increment); - slack -= colWidth[col]; - } - if (slack == startslack) break; - } + // cleanup + for(int i=0; i= numChildren() || i < 0 ? null : getChild(i); + public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); } + public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); } + public int localToGlobalX(int x) { return parent == null ? x : parent.globalToLocalX(x + this.x); } + public int localToGlobalY(int y) { return parent == null ? y : parent.globalToLocalY(y + this.y); } + + public Object call(Object method, JSArray args) throws JS.Exn { + if (!"indexof".equals(method)) return null; + Box b = (Box)args.elementAt(0); + if (b.parent != this) return (redirect == null || redirect == this) ? N(-1) : redirect.call(method, args); + return N(b.getIndexInParent()); } - /** - * Inserts value as child i; calls remove() if necessary. - * This method handles "reinserting" one of your children properly. - * INVARIANT: after completion, getChild(min(i, numChildren())) == newnode - * WARNING: O(n) runtime, unless i == numChildren() - */ - 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 null; - } - - if (redirect == null) { - 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) return t.perform(value); - } else if (value == null) { - if (i >= 0 && i < numChildren()) { - Box b = getChild(i); - b.remove(); - if (t != null) return t.perform(b); - } - } else { - Box newnode = (Box)value; - - // check if box being moved is currently target of a redirect - 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 null; - } - - // check for recursive ancestor violation - for(Box cur = this; cur != null; cur = cur.parent) - 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 null; - } + /** to be filled in by the Tree implementation */ + abstract void put(int i, Object value); + public int numchildren = 0; + abstract public int getIndexInParent(); + abstract public Box getChild(int i); + abstract public Box nextSibling(); + abstract public Box prevSibling(); + abstract public void remove(); + abstract Box swapPosition(Box x, Box y); - if (numKids > 15 && children == null) convert_to_array(); - newnode.remove(); - newnode.parent = this; - - if (children == null) { - if (firstKid == null) { - firstKid = newnode; - newnode.prevSibling = newnode; - newnode.nextSibling = newnode; - } else if (i >= numKids) { - newnode.prevSibling = firstKid.prevSibling; - newnode.nextSibling = firstKid; - firstKid.prevSibling.nextSibling = newnode; - firstKid.prevSibling = newnode; - } else { - Box cur = firstKid; - for(int j=0; j= children.size()) { - newnode.indexInParent = children.size(); - children.addElement(newnode); - } else { - children.insertElementAt(newnode, i); - for(int j=i; j= parent.children.size() - 1) return null; - return (Box)parent.children.elementAt(indexInParent + 1); - } - } - - /** returns our next sibling (parent[ourindex + 1]) */ - public final Box prevSibling() { - if (parent == null) return null; - if (parent.children == null) { - if (this == parent.firstKid) return null; - return prevSibling; - } else { - if (indexInParent == 0) return null; - return (Box)parent.children.elementAt(indexInParent - 1); - } - } - - /** Returns the parent of this node */ - public Box getParent() { return parent; } - - /** Returns ith child */ - public Box getChild(int i) { - if (children == null) { - if (firstKid == null) return null; - if (i >= numKids) return null; - if (i == numKids - 1) return firstKid.prevSibling; - Box cur = firstKid; - for(int j=0; j= children.size() || i < 0) return null; - return (Box)children.elementAt(i); - } - } - - /** Returns the number of children */ - public int numChildren() { - if (children == null) { - if (firstKid == null) return 0; - int i=1; - for(Box cur = firstKid.nextSibling; cur != firstKid; i++) cur = cur.nextSibling; - return i; - } else { - return children.size(); - } + private void setFill(Object value) { + if (value == null || !(value instanceof Res)) return; + Picture pic = Picture.fromRes((Res)value, null); + if (pic != null) { + texture = pic; + minwidth = texture.getWidth(); + minheight = texture.getHeight(); + MARK_REFLOW; + dirty(); + } else Picture.fromRes((Res)value, new Callback() { public Object call(Object arg) { + texture = (Picture)arg; + minwidth = texture.getWidth(); + minheight = texture.getHeight(); + Box b = Box.this; MARK_REFLOW_b; + dirty(); + return null; + } }); } - - /** Returns our index in our parent */ - public int getIndexInParent() { - if (parent == null) return 0; - if (parent.children == null) { - int i = 0; - for(Box cur = this; cur != parent.firstKid; i++) cur = cur.prevSibling; - return i; - } else { - return indexInParent; - } + + private void mouseEvent(String name, Object value) { + Surface surface = getSurface(); + if (surface == null) return; + int mousex = globalToLocalX(surface.mousex); + int mousey = globalToLocalY(surface.mousey); + for(Box c = prevSibling(); c != null; c = c.prevSibling()) + if (c.inside(mousex - c.x, mousey - c.y)) { JSTrap.putAndTriggerJSTraps(c, name, value); return; } + if (parent != null) JSTrap.putAndTriggerJSTraps(parent, name, value); } - /** returns the root of the surface that this box belongs to */ - public final Box getRoot() { - if (parent == null && surface != null) return this; - if (parent == null) return null; - return parent.getRoot(); + private static int stringToColor(String s) { + if (s == null) return 0x00000000; + else if (SVG.colors.get(s) != null) return 0xFF000000 | toInt(SVG.colors.get(s)); + else if (s.length() > 0 && s.charAt(0) == '#') try { + // FEATURE alpha + return 0xFF000000 | + (Integer.parseInt(s.substring(1, 3), 16) << 16) | + (Integer.parseInt(s.substring(3, 5), 16) << 8) | + Integer.parseInt(s.substring(5, 7), 16); + } catch (NumberFormatException e) { + Log.log(Box.class, "invalid color " + s); + return 0; + } + else return 0; // FEATURE: error? } - public void recompute_font() { - 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; + private static String colorToString(int argb) { + if ((argb & 0xFF000000) == 0) return null; + String red = Integer.toHexString((argb & 0x00FF0000) >> 16); + String green = Integer.toHexString((argb & 0x0000FF00) >> 8); + String blue = Integer.toHexString(argb & 0x000000FF); + if (red.length() < 2) red = "0" + red; + if (blue.length() < 2) blue = "0" + blue; + if (green.length() < 2) green = "0" + green; + return "#" + red + green + blue; } - - // Trivial Helper Method s(should be inlined) ///////////////////////////////////////// - - static final int min(int a, int b) { if (ab) return a; else return b; } - static final float max(float a, float b) { if (a>b) return a; else return b; } - static final int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; } - static final int max(int a, int b, int c) { if (a>=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 (!((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) { @@ -841,20 +571,18 @@ public final class Box extends JS.Scope { int globalx = 0; int globaly = 0; - // WARNING: this method is called from the event-queueing - // thread -- it may run concurrently with ANY part of XWT, and - // is UNSYNCHRONIZED for performance reasons. BE CAREFUL - // HERE. + // WARNING: this method is called from the event-queueing thread -- it may run concurrently with + // ANY part of XWT, and is UNSYNCHRONIZED for performance reasons. BE CAREFUL HERE. - if ((cur.flags & INVISIBLE_FLAG) != 0) return null; + if (!cur.test(VISIBLE)) 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--) { + for(int i=cur.numchildren - 1; i>=0; i--) { Box child = cur.getChild(i); if (child == null) continue; // since this method is unsynchronized, we have to double-check globalx += child.x; globaly += child.y; - if (!((child.flags & INVISIBLE_FLAG) != 0) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } + if (child.test(VISIBLE) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } globalx -= child.x; globaly -= child.y; } @@ -863,617 +591,82 @@ public final class Box extends JS.Scope { return cur; } - /** - * A helper class for properties of Box which require special - * handling. - * - * To avoid excessive use of String.equals(), the Box.get() and - * Box.put() methods employ a Hash keyed on property names that - * require special handling. The value stored in the Hash is an - * instance of an anonymous subclass of SpecialBoxProperty, which knows - * how to handle get()s and put()s for that property name. There - * should be one anonymous subclass of SpecialBoxProperty for each - * specially-handled property on Box. - */ - static class SpecialBoxProperty { - - SpecialBoxProperty() { } - - /** stores instances of SpecialBoxProperty; keyed on property name */ - static Hash specialBoxProperties = new Hash(200, 3); - - /** this method defines the behavior when the property is get()ed from b */ - Object get(Box b) { return null; } - - /** this method defines the behavior when the property is put() to b */ - void put(Box b, Object value) { } - - /** this method defines the behavior when the property is put() to b, allows a single SpecialBoxProperty to serve multiple properties */ - void put(String name, Box b, Object value) { put(b, value); } - - 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; } - }); - specialBoxProperties.put("textcolor", new ColorBoxProperty() { - public int getColor(Box b) { return b.textcolor; } - public void putColor(Box b, int argb) { b.textcolor = argb; } - }); - specialBoxProperties.put("strokecolor", new ColorBoxProperty() { - public int getColor(Box b) { return b.strokecolor; } - public void putColor(Box b, int argb) { b.strokecolor = argb; } - }); - - specialBoxProperties.put("text", new SpecialBoxProperty() { - public Object get(Box b) { return b.text; } - public void put(Box b, Object value) { - String t = value == null ? "null" : value.toString(); - if (t.equals(b.text)) return; - b.text = t; - b.dirty(); - b.recompute_font(); - } }); - - specialBoxProperties.put("path", new SpecialBoxProperty() { - public Object get(Box b) { throw new JS.Exn("cannot read from the path property"); } - public void put(Box b, Object value) { - String t = value == null ? "null" : value.toString(); - b.path = value == null ? null : VectorGraphics.parseVectorPath(value.toString()); - MARK_FOR_REFLOW_b; - b.dirty(); - } }); - - specialBoxProperties.put("transform", new SpecialBoxProperty() { - public void put(Box b, Object value) { - String t = value.toString().trim(); - b.transform = VectorGraphics.Affine.identity(); - while (t.length() > 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(); - } - MARK_FOR_REFLOW_b; - 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) { - // FIXME: translate value into a resource if it is a string - 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(); - b.recompute_font(); - } }); - - specialBoxProperties.put("fontsize", new SpecialBoxProperty() { - public Object get(Box b) { return b.font; } - public void put(Box b, Object 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(); - b.recompute_font(); - } }); - - 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(); - } }); - - specialBoxProperties.put("align", new SpecialBoxProperty() { - public Object get(Box b) { - switch(b.flags & ALIGN_FLAGS) { - case (ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG): return "topleft"; - case (ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG): return "bottomleft"; - case (ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG): return "topright"; - case (ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG): return "bottomright"; - case ALIGN_TOP_FLAG: return "top"; - case ALIGN_BOTTOM_FLAG: return "bottom"; - case ALIGN_LEFT_FLAG: return "left"; - case ALIGN_RIGHT_FLAG: return "right"; - case 0: return "center"; - default: throw new Error("invalid alignment flags: " + (b.flags & ALIGN_FLAGS)); - } - } - public void put(Box b, Object value) { - b.flags &= ~ALIGN_FLAGS; - if (value == null || value.equals("center")) { b.flags &= ALIGN_FLAGS; } - else if (value.equals("topleft")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG; } - else if (value.equals("bottomleft")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG; } - else if (value.equals("topright")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG; } - else if (value.equals("bottomright")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG; } - else if (value.equals("top")) { b.flags |= ALIGN_TOP_FLAG; } - else if (value.equals("bottom")) { b.flags |= ALIGN_BOTTOM_FLAG; } - else if (value.equals("left")) { b.flags |= ALIGN_LEFT_FLAG; } - else if (value.equals("right")) { b.flags |= ALIGN_RIGHT_FLAG; } - else Log.logJS("invalid alignment specifier \"" + value + "\""); - MARK_FOR_REFLOW_b; - b.dirty(); - } }); - - specialBoxProperties.put("thisbox", new SpecialBoxProperty() { - public Object get(Box b) { return b; } - public void put(Box b, Object value) { - if (value == null) b.remove(); - else if (Log.on) Log.log(this, "put invalid value to 'thisbox' property: " + value); - } - }); - - 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"; - else if (b.rows == 1) return "horizontal"; - 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; } - if (value.equals("vertical")) { - if (b.rows == 0) return; - b.rows = 0; b.cols = 1; - } else if (value.equals("horizontal")) { - if (b.cols == 0) return; - b.cols = 0; b.rows = 1; - } else if (Log.on) - Log.log(this, "invalid value put to orient property: " + value); - MARK_FOR_REFLOW_b; - } }); - - specialBoxProperties.put("shrink", new SpecialBoxProperty() { - public Object get(Box b) { return (((b.flags & HSHRINK_FLAG) != 0) || ((b.flags & VSHRINK_FLAG) != 0)) ? Boolean.TRUE : Boolean.FALSE; } - public void put(Box b, Object value) { b.put("hshrink", value); b.put("vshrink", value); } - }); - - //#repeat hshrink/vshrink HSHRINK_FLAG/VSHRINK_FLAG - specialBoxProperties.put("hshrink", new SpecialBoxProperty() { - public Object get(Box b) { return new Boolean((b.flags & HSHRINK_FLAG) != 0); } - public void put(Box b, Object value) { - boolean newshrink = stob(value); - if (((b.flags & HSHRINK_FLAG) != 0) == newshrink) return; - if (newshrink) b.flags |= HSHRINK_FLAG; else b.flags &= ~HSHRINK_FLAG; - MARK_FOR_REFLOW_b; - } - }); - //#end - - //#repeat x/y - specialBoxProperties.put("x", new SpecialBoxProperty() { - public Object get(Box b) { - if (b.surface == null) return new Integer(0); - if ((b.flags & INVISIBLE_FLAG) != 0) return new Integer(0); - return new Integer(b.x); - } - public void put(Box b, Object value) { - if (!((b.flags & NOTPACKED_FLAG) != 0) && (b.parent != null || b.surface == null)) return; - int x = stoi(value); - if (x == b.x) return; - b.dirty(); - b.x = x; - if (b.parent == null && b.surface != null) b.surface.setLocation(); - MARK_FOR_REFLOW_b; - b.dirty(); - } - }); - //#end - - //#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) { - int newval = stoi(value); - if (b.parent == null && b.surface != null) { - // 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 == newval && b.maxwidth == newval) return; - b.minwidth = b.maxwidth = newval; - MARK_FOR_REFLOW_b; - } - } }); - //#end - - //#repeat cols/rows rows/cols - specialBoxProperties.put("cols", new SpecialBoxProperty() { - public Object get(Box b) { return new Double(b.cols); } - public void put(Box b, Object value) { - if (b.cols == stoi(value)) return; - b.cols = stoi(value); - if (b.cols == 0 && b.rows == 0) b.rows = 1; - if (b.cols != 0 && b.rows != 0) b.rows = 0; - MARK_FOR_REFLOW_b; - } }); - //#end - - //#repeat colspan/rowspan - specialBoxProperties.put("colspan", new SpecialBoxProperty() { - public Object get(Box b) { return new Double(b.colspan); } - public void put(Box b, Object value) { - if (b.colspan == stoi(value)) return; - b.colspan = stoi(value); - MARK_FOR_REFLOW_b; - } - }); - //#end - - 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) { - if (((b.flags & NOCLIP_FLAG) != 0) == stob(value)) return; - if (stob(value)) b.flags |= NOCLIP_FLAG; else b.flags &= ~NOCLIP_FLAG; - MARK_FOR_REFLOW_b; - b.dirty(); - } }); - - specialBoxProperties.put("visible", new SpecialBoxProperty() { - public Object get(Box b) { - for (Box cur = b; cur != null; cur = cur.parent) { - if ((cur.flags & INVISIBLE_FLAG) != 0) return Boolean.FALSE; } - return Boolean.TRUE; - } - public void put(Box b, Object value) { - if (!stob(value) == ((b.flags & INVISIBLE_FLAG) != 0)) return; - if (!stob(value)) b.flags |= INVISIBLE_FLAG; else b.flags &= ~INVISIBLE_FLAG; - if (b.parent == null) { - if (b.surface != null) b.surface.setInvisible((b.flags & INVISIBLE_FLAG) != 0); - } else { - b.dirty(); - MARK_FOR_REFLOW_b_parent; - b.parent.dirty(b.x, b.y, b.width, b.height); - } - }}); - - specialBoxProperties.put("packed", new SpecialBoxProperty() { - public Object get(Box b) { return ((b.flags & NOTPACKED_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } - public void put(Box b, Object value) { - if (stob(value) == ((b.flags & NOTPACKED_FLAG) == 0)) return; - if (!stob(value)) b.flags |= NOTPACKED_FLAG; else b.flags &= ~NOTPACKED_FLAG; - if ((b.flags & NOTPACKED_FLAG) != 0) { b.x = 0; b.y = 0; } - if (b.parent != null) MARK_FOR_REFLOW_b_parent; - } }); - - //#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); } - public void put(Box b, Object value) { - if (b.surface == null || b.parent == null) return; - b.put("x", new Integer(stoi(value) - stoi(get(b.parent)))); - MARK_FOR_REFLOW_b; - } - }); - //#end - - specialBoxProperties.put("cursor", new SpecialBoxProperty() { - public Object get(Box b) { return b.cursor; } - public void put(Box b, Object value) { - b.cursor = (String)value; - if (b.surface == null) return; - - // see if we need to update the surface cursor - Surface surface = b.getRoot().surface; - String tempcursor = surface.cursor; - b.Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); - if (surface.cursor != tempcursor) surface.syncCursor(); - } - }); - - //#repeat mousex/mousey x/y - specialBoxProperties.put("mousex", new SpecialBoxProperty() { - public Object get(Box b) { - Surface surface = b.getRoot().surface; - if (surface == null) return new Integer(0); - int mousex = surface.mousex; - for(Box cur = b; cur != null && cur.parent != null; cur = cur.parent) mousex -= cur.x; - return new Integer(mousex); - } - }); - //#end - - specialBoxProperties.put("mouseinside", new SpecialBoxProperty() { - public Object get(Box b) { - return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } - }); - - specialBoxProperties.put("numchildren", new SpecialBoxProperty() { - public Object get(Box b) { - if (b.redirect == null) return new Integer(0); - if (b.redirect != b) return get(b.redirect); - return new Integer(b.numChildren()); - } }); - - SpecialBoxProperty mouseEventHandler = new SpecialBoxProperty() { - public void put(String name, Box b, Object value) { - Surface surface = b.getRoot().surface; - if (surface == null) return; - int mousex = surface.mousex; - int mousey = surface.mousey; - for(Box c = b.parent; c != null && c.parent != null; c = c.parent) { - mousex -= c.x; - mousey -= c.y; - } - for(Box c = b.prevSibling(); c != null; c = c.prevSibling()) { - if (c.inside(mousex - c.x, mousey - c.y)) { - c.put(name, value); - return; - } - } - if (b.parent != null) b.parent.put(name, value); - }}; - - specialBoxProperties.put("Press1", mouseEventHandler); - specialBoxProperties.put("Press2", mouseEventHandler); - specialBoxProperties.put("Press3", mouseEventHandler); - specialBoxProperties.put("Release1", mouseEventHandler); - specialBoxProperties.put("Release2", mouseEventHandler); - specialBoxProperties.put("Release3", mouseEventHandler); - specialBoxProperties.put("Click1", mouseEventHandler); - specialBoxProperties.put("Click2", mouseEventHandler); - specialBoxProperties.put("Click3", mouseEventHandler); - specialBoxProperties.put("DoubleClick1", mouseEventHandler); - specialBoxProperties.put("DoubleClick2", mouseEventHandler); - specialBoxProperties.put("DoubleClick3", mouseEventHandler); - - specialBoxProperties.put("root", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (stob(value)) b.flags |= ISROOT_FLAG; - else b.flags &= ~ISROOT_FLAG; - } - public Object get(Box b) { - if (b.parent == null || ((b.flags & ISROOT_FLAG) != 0)) return b; - else return get(b.parent); - } }); - - specialBoxProperties.put("Minimized", new SpecialBoxProperty() { - public Object get(Box b) { - if (b.parent == null && b.surface != null) return b.surface.minimized ? Boolean.TRUE : Boolean.FALSE; - else return null; - } - public void put(Box b, Object value) { - if (b.surface == null) return; - boolean val = stob(value); - if (b.parent == null && b.surface.minimized != val) b.surface.setMinimized(val); - } - }); - - specialBoxProperties.put("Maximized", new SpecialBoxProperty() { - public Object get(Box b) { - if (b.parent == null && b.surface != null) return b.surface.maximized ? Boolean.TRUE : Boolean.FALSE; - else return null; - } - public void put(Box b, Object value) { - if (b.surface == null) return; - boolean val = stob(value); - if (b.parent == null && b.surface.maximized != val) b.surface.setMaximized(val); - } - }); - - specialBoxProperties.put("toback", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (b.parent == null && stob(value) && b.surface != null) b.surface.toBack(); - } - }); - - specialBoxProperties.put("tofront", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (b.parent == null && stob(value) && b.surface != null) b.surface.toFront(); - } - }); - - specialBoxProperties.put("Close", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (b.parent == null && b.surface != null) b.surface.dispose(true); - } - }); - - // these are all do-nothings; just to prevent space from getting taken up in the params Hash. - specialBoxProperties.put("KeyPressed", new SpecialBoxProperty()); - specialBoxProperties.put("KeyReleased", new SpecialBoxProperty()); - specialBoxProperties.put("PosChange", new SpecialBoxProperty()); - specialBoxProperties.put("SizeChange", new SpecialBoxProperty()); - - //#repeat minwidth/minheight maxwidth/maxheight - specialBoxProperties.put("minwidth", new SpecialBoxProperty() { - public Object get(Box b) { return new Integer(b.minwidth); } - public void put(Box b, Object value) { - if (stoi(value) == b.minwidth) return; - b.minwidth = stoi(value); - MARK_FOR_REFLOW_b; - } - }); - specialBoxProperties.put("maxwidth", new SpecialBoxProperty() { - public Object get(Box b) { return new Integer(b.maxwidth); } - public void put(Box b, Object value) { - if (stoi(value) == b.maxwidth) return; - b.maxwidth = stoi(value); - MARK_FOR_REFLOW_b; - } - }); - //#end - - specialBoxProperties.put("redirect", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (b.redirect != b) Log.log(this, "cannot change the redirect of a box once it is set"); - else if (value == null) b.redirect = null; - else { - Box b2 = (Box)value; - while(b2 != b && b2 != null) b2 = b2.parent; - if (b2 == null) Log.log(this, "a box's redirect must be one of its descendants"); - b.redirect = (Box)value; - } - } - public Object get(Box b) { - if (b.redirect == null) return null; - if (b.redirect == b) return Boolean.TRUE; - return get(b.redirect); - } - }); - - // FEATURE: this still isn't totally harmonious; when you createSurface, these aren't checked - specialBoxProperties.put("titlebar", new SpecialBoxProperty() { - public void put(Box b, Object value) { - if (b.surface != null) b.surface.setTitleBarText(value.toString()); - b.put_("titlebar", value); - } - public Object get(Box b) { return b.get_("titlebar"); } - }); - - specialBoxProperties.put("icon", new SpecialBoxProperty() { - // FIXME - /* - public void put(Box b, Object value) { - b.put_("icon", value); - if (b.surface == null) return; - Picture pic = ImageDecoder.getPicture(value.toString()); - if (pic != null) b.surface.setIcon(pic); - else if (Log.on) Log.log(this, "unable to load icon " + value); - } - public Object get(Box b) { return b.get_("icon"); } - */ - }); + + // Trivial Helper Methods (should be inlined) ///////////////////////////////////////// + + static final short min(short a, short b) { if (ab) return a; else return b; } + static final int max(int a, int b) { if (a>b) return a; else return b; } + static final float max(float a, float b) { if (a>b) return a; else return b; } + + static final int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; } + static final int max(int a, int b, int c) { if (a>=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 test(VISIBLE) && x >= 0 && y >= 0 && x < width && y < height; } + + protected final void set(int mask) { flags |= mask; } + protected final void clear(int mask) { flags &= ~mask; } + protected final boolean test(int mask) { return ((flags & mask) == mask); } + + protected Box left = null; + protected Box right = null; + protected Box parent_ = null; // not to be confused with Box.parent_! + protected Box rootChild = null; + protected abstract Box fixAfterInsertion(); + protected abstract Box fixAfterDeletion(); + protected abstract Box rightmost(); + protected abstract Box leftmost(); + protected abstract Box rotateLeft(); + protected abstract Box rotateRight(); +} + + + + + + + /* + offset_x = 0; + if (path != null) { + if (rpath == null) rpath = path.realize(transform == null ? VectorGraphics.Affine.identity() : transform); + if ((flags & HSHRINK) != 0) contentwidth = max(contentwidth, rpath.boundingBoxWidth()); + if ((flags & VSHRINK) != 0) contentheight = max(contentheight, rpath.boundingBoxHeight()); + // FIXME: separate offset_x needed for the path } + // #repeat x1/y1 x2/y2 x3/y3 x4/y4 contentwidth/contentheight left/top right/bottom + int x1 = transform == null ? 0 : (int)transform.multiply_px(0, 0); + int x2 = transform == null ? 0 : (int)transform.multiply_px(contentwidth, 0); + int x3 = transform == null ? contentwidth : (int)transform.multiply_px(contentwidth, contentheight); + int x4 = transform == null ? contentwidth : (int)transform.multiply_px(0, contentheight); + int left = min(min(x1, x2), min(x3, x4)); + int right = max(max(x1, x2), max(x3, x4)); + contentwidth = max(contentwidth, right - left); + offset_x = -1 * left; + // #end + */ - private static abstract class ColorBoxProperty extends SpecialBoxProperty { - public abstract int getColor(Box b); - public abstract void putColor(Box b, int argb); - public Object get(Box b) { - if ((getColor(b) & 0xFF000000) == 0) return null; - String red = Integer.toHexString((getColor(b) & 0x00FF0000) >> 16); - String green = Integer.toHexString((getColor(b) & 0x0000FF00) >> 8); - String blue = Integer.toHexString(getColor(b) & 0x000000FF); - if (red.length() < 2) red = "0" + red; - if (blue.length() < 2) blue = "0" + blue; - if (green.length() < 2) green = "0" + green; - return "#" + red + green + blue; - } - public void put(Box b, Object value) { - int newcolor = getColor(b); - String s = value == null ? null : value.toString(); - if (value == null) newcolor = 0x00000000; - else if (s.length() > 0 && s.charAt(0) == '#') - try { - newcolor = 0xFF000000 | - (Integer.parseInt(s.substring(1, 3), 16) << 16) | - (Integer.parseInt(s.substring(3, 5), 16) << 8) | - Integer.parseInt(s.substring(5, 7), 16); - } catch (NumberFormatException e) { - Log.log(this, "invalid color " + s); - return; - } - else if (org.xwt.translators.SVG.colors.get(s) != null) - newcolor = 0xFF000000 | ((Integer)org.xwt.translators.SVG.colors.get(s)).intValue(); - if (newcolor == getColor(b)) return; - putColor(b, newcolor); - b.dirty(); + + /* + if (path != null) { + if (rtransform == null) rpath = null; + else if (!rtransform.equalsIgnoringTranslation(a)) rpath = null; + else { + rpath.translate((int)(a.e - rtransform.e), (int)(a.f - rtransform.f)); + rtransform = a.copy(); } + if (rpath == null) rpath = path.realize((rtransform = a) == null ? VectorGraphics.Affine.identity() : a); + if ((strokecolor & 0xff000000) != 0) rpath.stroke(buf, 1, strokecolor); + if ((fillcolor & 0xff000000) != 0) rpath.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor)); } - } - - /** helper that converts a String to a boolean according to JavaScript coercion rules */ - public static boolean stob(Object o) { - if (o == null) return false; - return Boolean.TRUE.equals(o) || "true".equals(o); - } +*/ - /** helper that converts a String to an int according to JavaScript coercion rules */ - public static int stoi(Object o) { - if (o == null) return 0; - if (o instanceof Integer) return ((Integer)o).intValue(); - - String s; - if (!(o instanceof String)) s = o.toString(); - else s = (String)o; - - try { return Integer.parseInt(s.indexOf('.') == -1 ? s : s.substring(0, s.indexOf('.'))); } - catch (NumberFormatException e) { return 0; } - } -} - - +/* + VectorGraphics.Affine a2 = VectorGraphics.Affine.translate(b.x, b.y); + if (transform != null) a2.multiply(transform); + a2.multiply(VectorGraphics.Affine.translate(offset_x, offset_y)); + a2.multiply(a); +*/