X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=c4f34e599ae38e2032334d9cf47884ac1bb29159;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=dce1f2771abb1d64d81c1433db0f12e63ac26671;hpb=c89a34fe990cf3d82a919eaff32288d25ce3ecb4;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index dce1f27..c4f34e5 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -39,7 +39,7 @@ import org.xwt.translators.*; * SizeChanges trigger an Surface.abort; if rendering were done in the same * pass, rendering work done prior to the Surface.abort would be wasted. */ -public abstract class Box extends JSScope implements JSTrap.JSTrappable { +public final class Box extends JSScope implements Scheduler.Task { // Macros ////////////////////////////////////////////////////////////////////// @@ -57,10 +57,43 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { //#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; + void mark_for_repack() { MARK_REPACK; } + protected Box() { super(null); } static Hash boxToCursor = new Hash(500, 3); public static final int MAX_LENGTH = Integer.MAX_VALUE; + static final Font DEFAULT_FONT; + + static { + Font f = null; + try { f = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } + catch(JSExn e) { Log.info(Box.class, "should never happen: "+e); } + DEFAULT_FONT = f; + } + + // FIXME update these + // box properties can not be trapped + static final String[] props = new String[] { + "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows", + "colspan", "rowspan", "align", "visible", "packed", "globalx", "globaly", + "minwidth", "maxwidth", "minheight", "maxheight", "indexof", "thisbox", "clip", + "numchildren", "redirect", "cursor", "mouse" + }; + + // FIXME update these + // events can have write traps, but not read traps + static final String[] events = new String[] { + "Press1", "Press2", "Press3", + "Release1", "Release2", "Release3", + "Click1", "Click2", "Click3", + "DoubleClick1", "DoubleClick2", "DoubleClick3", + "Enter", "Leave", "Move", + "KeyPressed", "KeyReleased", "PosChange", "SizeChange", + "childadded", "childremoved", + "Focused", "Maximized", "Minimized", "Close", + "icon", "titlebar", "toback", "tofront" + }; // Flags ////////////////////////////////////////////////////////////////////// @@ -86,27 +119,30 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { 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; + static final int CLIP = 0x00020000; + static final int STOP_UPWARD_PROPAGATION = 0x00040000; // Instance Data ////////////////////////////////////////////////////////////////////// Box parent = null; Box redirect = this; - int flags = VISIBLE | PACKED; + int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP; private String text = null; - private Font font = null; - private Picture texture; + private Font font = DEFAULT_FONT; + private Picture texture = null; private short strokewidth = 1; - private int fillcolor = 0x00000000; + public int fillcolor = 0x00000000; private int strokecolor = 0xFF000000; + private int aspect = 0; + // specified directly by user public LENGTH minwidth = 0; - public LENGTH maxwidth = 0; + public LENGTH maxwidth = MAX_LENGTH; public LENGTH minheight = 0; - public LENGTH maxheight = 0; + public LENGTH maxheight = MAX_LENGTH; private short rows = 1; private short cols = 0; private short rowspan = 1; @@ -131,15 +167,33 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { // Instance Methods ///////////////////////////////////////////////////////////////////// + + /** invoked when a resource needed to render ourselves finishes loading */ + public void perform() throws JSExn { + + // FIXME; we can't assume that just because we were performed the image is loaded. + // as external events have occured, check the state of box + if (texture != null) { + if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); } + else { Stream res = texture.res; texture = null; throw new JSExn("image not found: "+res); } + } + + MARK_REPACK; + MARK_REFLOW; + MARK_RESIZE; + dirty(); + } + 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() { dirty(0, 0, width, height); } - public final void dirty(int x, int y, int w, int h) { + public void dirty() { dirty(0, 0, width, height); } + public void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.parent) { - if (!cur.test(NOCLIP)) { + // x and y have a different meaning on the root box + if (cur.parent != null && cur.test(CLIP)) { w = min(x + w, cur.width) - max(x, 0); h = min(y + h, cur.height) - max(y, 0); x = max(x, 0); @@ -152,48 +206,19 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { } } - public void putAndTriggerJSTraps(Object key, Object value) { - } - - /** 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 = test(MOUSEINSIDE); - boolean isinside = test(VISIBLE) && inside(mousex, mousey) && !forceleave; - if (isinside) set(MOUSEINSIDE); else clear(MOUSEINSIDE); - if (!wasinside && !isinside) return; - - if (isinside && test(CURSOR)) Surface.fromBox(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; - } - } - // 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(int new_width, int new_height) { - repack(); - 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); - } + private static LENGTH[] colWidth = new LENGTH[65535]; + private static LENGTH[] colMaxWidth = new LENGTH[65535]; + private static LENGTH[] rowHeight = new LENGTH[65535]; + private static LENGTH[] rowMaxHeight = new LENGTH[65535]; + static { for(int i=0; i r) continue; - if (col != 0 && col + min(cols, child.colspan) > cols) break; + short r = 0; + for(Box child = firstPackedChild(); child != null; r++) { + for(short c=0, numclear=0; child != null && c < cols; c++) { + if (numRowsInCol[c] > r) { numclear = 0; continue; } + if (c != 0 && c + min(cols, child.colspan) - numclear > 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(); + for(int i=c - numclear + 1; i <= c; i++) numRowsInCol[i] += child.rowspan; + child.col = (short)(c - numclear + 1); child.row = r; rows = (short)max(rows, child.row + child.rowspan); + child = child.nextPackedSibling(); + numclear = 0; } + } for(int i=0; i 0) resize_children(); } - private void resize_children() { - int slack; - //#repeat col/row colspan/rowspan contentwidth/contentheight x/y width/height \ - // HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight + void resize_children() { + //#repeat col/row colspan/rowspan contentwidth/contentheight x/y width/height colMaxWidth/rowMaxHeight colWidth/rowHeight \ + // HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight x_slack/y_slack // PHASE 1: compute column min/max sizes - slack = 0; + int x_slack = 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; + for(int startslack = 0; x_slack > 0 && cols > 0 && startslack != x_slack;) { + int increment = max(1, x_slack / cols); + startslack = x_slack; + for(short col=0; col < cols; col++) { + // FIXME: double check this + int diff = min(min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col], x_slack); + x_slack -= diff; colWidth[col] += diff; } } + //#end - 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; + // Phase 3: assign childrens' actual sizes + for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (!child.test(VISIBLE)) continue; + int child_width, child_height, child_x, child_y; + if (!child.test(PACKED)) { + child_x = child.x; + child_y = child.y; + child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child.x); + child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child.y); + child_width = max(child.minwidth, child_width); + child_height = max(child.minheight, child_height); + } else { + int unbounded; + //#repeat col/row colspan/rowspan contentwidth/contentheight width/height colMaxWidth/rowMaxHeight \ + // child_x/child_y x/y HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight x_slack/y_slack \ + // colWidth/rowHeight child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP + unbounded = 0; + for(int i = child.col; i < child.col + child.colspan; i++) unbounded += colWidth[i]; + child_width = min(unbounded, child.test(HSHRINK) ? child.contentwidth : child.maxwidth); + child_x = test(ALIGN_RIGHT) ? x_slack : test(ALIGN_LEFT) ? 0 : x_slack / 2; + for(int i=0; i < child.col; i++) child_x += colWidth[i]; + if (child_width > unbounded) child_x -= (child_width - unbounded) / 2; + //#end + } + child.resize(child_x, child_y, child_width, child_height); } // cleanup - for(int i=0; i 0 && s.charAt(0) == '#') try { + else if (s.length() == 7 && 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); + Log.info(Box.class, "invalid color " + s); return 0; } else return 0; // FEATURE: error? @@ -576,7 +729,7 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { 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.treeSize() - 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; @@ -593,36 +746,125 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { // 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 short max(short a, short b) { if (a>b) return a; else return b; } + static int max(int a, int b) { if (a>b) return a; else return b; } + static 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; } + static 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 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 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); } + void set(int mask) { flags |= mask; } + void set(int mask, boolean setclear) { if (setclear) set(mask); else clear(mask); } + void clear(int mask) { flags &= ~mask; } + boolean test(int mask) { return ((flags & mask) == mask); } - protected Box left = null; - protected Box right = null; - protected Box rootChild = null; - protected Box peerTree_parent = null; - public abstract Box peerTree_leftmost(); - public abstract Box peerTree_rightmost(); - public abstract Box insertBeforeMe(Box cell); - public abstract Box insertAfterMe(Box cell); - protected abstract Box fixAfterInsertion(); - protected abstract Box fixAfterDeletion(); - protected abstract Box rotateLeft(); - protected abstract Box rotateRight(); - protected abstract int numPeerChildren(); + + // Tree Handling ////////////////////////////////////////////////////////////////////// + + public final int getIndexInParent() { return parent == null ? 0 : parent.indexNode(this); } + public final Box nextSibling() { return parent == null ? null : parent.getChild(parent.indexNode(this) + 1); } + public final Box prevSibling() { return parent == null ? null : parent.getChild(parent.indexNode(this) - 1); } + public final Box getChild(int i) { + if (i < 0) return null; + if (i >= treeSize()) return null; + return (Box)getNode(i); + } + + // Tree Manipulation ///////////////////////////////////////////////////////////////////// + + void removeSelf() { + if (parent != null) { parent.removeChild(parent.indexNode(this)); return; } + Surface surface = Surface.fromBox(this); + if (surface != null) surface.dispose(true); + } + + /** remove the i^th child */ + public void removeChild(int i) { + Box b = getChild(i); + MARK_REFLOW_b; + b.dirty(); + b.clear(MOUSEINSIDE); + deleteNode(i); + b.parent = null; + MARK_REFLOW; + putAndTriggerTrapsAndCatchExceptions("childremoved", b); + } + + public void put(int i, Object value) throws JSExn { + if (i < 0) return; + + if (value != null && !(value instanceof Box)) { + if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box"); + return; + } + + if (redirect == null) { + if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i)); + else JS.log(this, "attempt to add/remove children to/from a node with a null redirect"); + + } else if (redirect != this) { + if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value); + redirect.put(i, value); + if (value == null) { + Box b = (Box)redirect.get(new Integer(i)); + if (b != null) putAndTriggerTrapsAndCatchExceptions("childremoved", b); + } + + } else if (value == null) { + if (i < 0 || i > treeSize()) return; + Box b = getChild(i); + removeChild(i); + putAndTriggerTrapsAndCatchExceptions("childremoved", b); + + } else { + Box b = (Box)value; + + // check if box being moved is currently target of a redirect + for(Box cur = b.parent; cur != null; cur = cur.parent) + if (cur.redirect == b) { + if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect"); + return; + } + + // check for recursive ancestor violation + for(Box cur = this; cur != null; cur = cur.parent) + if (cur == b) { + if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor"); + if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b); + return; + } + + if (b.parent != null) b.parent.removeChild(b.parent.indexNode(b)); + insertNode(i, b); + b.parent = this; + + // need both of these in case child was already uncalc'ed + MARK_REFLOW_b; + MARK_REFLOW; + + b.dirty(); + putAndTriggerTrapsAndCatchExceptions("childadded", b); + } + } + + void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { + try { + putAndTriggerTraps(name, val); + } catch (JSExn e) { + JS.log("caught js exception while putting to trap \""+name+"\""); + JS.log(e); + } catch (Exception e) { + JS.log("caught exception while putting to trap \""+name+"\""); + JS.log(e); + } + } + }