X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=c898d8e1cfb502749b2aa88234e56013cedfa506;hp=180a65221be3dfa743d970c3c95c566518dcf70a;hb=da1f843588c8bd2b2c7cc74a5b4ffff8d57ab712;hpb=1f1bf81e022398831354365d6522e92079556530 diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java index 180a652..c898d8e 100644 --- a/src/org/ibex/Box.java +++ b/src/org/ibex/Box.java @@ -1,14 +1,17 @@ // FIXME -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.ibex; -// FEATURE: reflow before allowing js to read from width/height -// FEATURE: fastpath for rows=1/cols=1 +// FIXME: are traps on x/y meaningful? +// FIXME: if we trap on cols, then set rows to 0 (forcing cols to 1), does the cols trap get triggered? +// FIXME: if we change min{width/height}, thereby forcing a change to max{min/height}, does a trap on those get triggered? +// FIXME: trap on numchildren? replaces ChildChanged? +// FIXME: trap on visible, trigger when parent visibility changes + +// FIXME: ax/ay nonsense +// FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down + // 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.util.*; @@ -24,75 +27,38 @@ import org.ibex.translators.*; * *

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. - *
    1. reconstraining: Minimum and maximum sizes of columns are computed. - *
    2. resizing: width/height and x/y positions of children - * are assigned, and PosChange/SizeChanges are triggered. - *
    3. repainting: children draw their content onto the PixelBuffer. + *
      1. pack(): each box sets its childrens' row/col + *
        1. constrain(): contentwidth is computed + *
        2. resize(): width/height and x/y positions are set + *
        3. render(): children draw their content onto the PixelBuffer. *
        * - * 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 first three passes together are called the reflow + * phase. Reflowing is done in a seperate pass since SizeChanges + * trigger a Surface.abort; if rendering were done in the same pass, + * rendering work done prior to the Surface.abort would be wasted. */ public final class Box extends JSScope implements Scheduler.Task { // Macros ////////////////////////////////////////////////////////////////////// - //#define LENGTH int - //#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); + final void REPLACE() { for(Box b2 = this; b2 != null && !b2.test(REPLACE); b2 = b2.parent) b2.set(REPLACE); } + final void RECONSTRAIN() { for(Box b2 = this; b2 != null && !b2.test(RECONSTRAIN); b2 = b2.parent) b2.set(RECONSTRAIN); } + final void REPACK() { for(Box b2 = this; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); } + //#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; - - void mark_for_repack() { MARK_REPACK; } + //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JS.toString(value).equals(prop))) break; prop=JS.toString(value); protected Box() { super(null); } + // FIXME memory leak 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" - }; + static final Font DEFAULT_FONT = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10); + // Flags ////////////////////////////////////////////////////////////////////// @@ -109,9 +75,9 @@ public final class Box extends JSScope implements Scheduler.Task { 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 RECONSTRAIN = 0x00000200; + static final int REPLACE = 0x00000400; + static final int ALIGN_TOP = 0x00001000; static final int ALIGN_BOTTOM = 0x00002000; static final int ALIGN_LEFT = 0x00004000; @@ -120,13 +86,14 @@ public final class Box extends JSScope implements Scheduler.Task { static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues? static final int CLIP = 0x00020000; static final int STOP_UPWARD_PROPAGATION = 0x00040000; + static final int MOVED = 0x00080000; // Instance Data ////////////////////////////////////////////////////////////////////// Box parent = null; Box redirect = this; - int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP; + int flags = VISIBLE | PACKED | REPACK | RECONSTRAIN | REPLACE | FIXED | STOP_UPWARD_PROPAGATION | CLIP | MOVED; private String text = null; private Font font = DEFAULT_FONT; @@ -138,10 +105,10 @@ public final class Box extends JSScope implements Scheduler.Task { private int aspect = 0; // specified directly by user - public LENGTH minwidth = 0; - public LENGTH maxwidth = MAX_LENGTH; - public LENGTH minheight = 0; - public LENGTH maxheight = MAX_LENGTH; + public int minwidth = 0; + public int maxwidth = Integer.MAX_VALUE; + public int minheight = 0; + public int maxheight = Integer.MAX_VALUE; private short rows = 1; private short cols = 0; private short rowspan = 1; @@ -150,14 +117,14 @@ public final class Box extends JSScope implements Scheduler.Task { // computed during reflow private short row = 0; private short col = 0; - public LENGTH x = 0; - public LENGTH y = 0; - public LENGTH ax = 0; // FEATURE: roll these into x/y; requires lots of changes - public LENGTH ay = 0; // FEATURE: roll these into x/y; requires lots of changes; perhaps y()? - public LENGTH width = 0; - public LENGTH height = 0; - private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth)) - private LENGTH contentheight = 0; + public int x = 0; + public int y = 0; + public int ax = 0; // FEATURE: roll these into x/y; requires lots of changes + public int ay = 0; // FEATURE: roll these into x/y; requires lots of changes; perhaps y()? + public int width = 0; + public int height = 0; + private int contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth)) + private int contentheight = 0; /* private VectorGraphics.VectorPath path = null; @@ -166,30 +133,22 @@ public final class Box extends JSScope implements Scheduler.Task { private VectorGraphics.Affine rtransform = null; */ + //#define DIRTY dirty() + // Instance Methods ///////////////////////////////////////////////////////////////////// public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; } /** 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 { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); } - } else { - Log.warn(Box.class, "perform() called with null texture"); - } - MARK_REPACK; - MARK_REFLOW; - MARK_RESIZE; - dirty(); + if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; } + if (texture.isLoaded) { + setWidth(max(texture.width, maxwidth), maxwidth); + setHeight(max(texture.height, maxheight), maxheight); + DIRTY; } + else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); } } - 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 void dirty() { dirty(0, 0, width, height); } @@ -212,115 +171,179 @@ public final class Box extends JSScope implements Scheduler.Task { // Reflow //////////////////////////////////////////////////////////////////////////////////////// - // static stuff so we don't have to keep reallocating - private static int[] numRowsInCol = new int[65535]; - 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) { numclear = 0; continue; } - if (c != 0 && c + min(cols, child.colspan) - numclear > cols) break; - if (++numclear < min(cols, child.colspan)) continue; - 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; - } + rows = 0; + for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (!child.test(PACKED) || !child.test(VISIBLE)) continue; + if (cols == 1) { child.row = rows; rows += child.rowspan; child.col = 0; continue; } + child.col = (short)(frontier_size <= 0 ? 0 : (frontier[frontier_size-1].col + frontier[frontier_size-1].colspan)); + child.row = (short)(frontier_size <= 0 ? 0 : frontier[frontier_size-1].row); + if (child.col + min(cols,child.colspan) > cols) { child.col = 0; child.row++; } + for(int i=0; ichild.col) { + child.col = (short)(frontier[i].col + frontier[i].colspan); + if (child.col + min(cols,child.colspan) > cols) { + child.row = (short)(frontier[i].row + frontier[i].rowspan); + for(i--; i>0; i--) child.row = (short)min(row, frontier[i].row + frontier[i].rowspan); + child.col = (short)0; + } + i = -1; + } else break; + frontier[frontier_size++] = child; } - for(int i=0; i 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; + } else if (cols > 1) do { + + // FIXME: cache these? + // compute regions + numregions = 0; + for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) { + regions[numregions++] = c.col; + regions[numregions++] = min(cols, c.col+c.colspan); } - } + Vec.sortInts(regions, 0, numregions); + int j = 0; + int newnumregions = numregions; + for(int i=1; i= min(child.col+child.colspan,cols)) { minregion = r; break; } + total -= sizes[r]; + int child_maxwidth = child.test(HSHRINK)?child.contentwidth:child.maxwidth; + if (sizes[r] <= (float)(targetColumnSize*(regions[r+1]-regions[r]))) + if ((child.colspan * targetColumnSize) > (child_maxwidth + (float)0.5)) + sizes[r] = (float)Math.min(sizes[r], (regions[r+1]-regions[r])*(child_maxwidth/child.colspan)); + if ((child.colspan * targetColumnSize) < (child.contentwidth - (float)0.5)) + sizes[r] = (float)Math.max(sizes[r], (regions[r+1]-regions[r])*(child.contentwidth/child.colspan)); + total += sizes[r]; + } + float save = targetColumnSize; + if (Math.abs(total - target) <= (float)1.0) break; + if (!first) { + if (Math.abs(total - last_total) <= (float)1.0) break; + } else { + last_columnsize = ((total - target) / (float)cols) + targetColumnSize; + } + if (total < target) targetColumnSize += Math.abs((last_columnsize - targetColumnSize) / (float)1.1); + else if (total > target) targetColumnSize -= Math.abs((last_columnsize - targetColumnSize) / (float)1.1); + last_columnsize = save; + last_total = total; + first = false; + } + if (findMinimum) contentwidth = Math.round(total); + else this.targetColumnSize = targetColumnSize; + } while(false); //#end + } - // Phase 3: assign childrens' actual sizes + void place() { + solve(false); for(Box child = getChild(0); child != null; child = child.nextSibling()) { if (!child.test(VISIBLE)) continue; + if (!child.test(REPLACE)) continue; int child_width, child_height, child_x, child_y; if (!child.test(PACKED)) { child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - Math.abs(child.ax)); @@ -332,28 +355,34 @@ public final class Box extends JSScope implements Scheduler.Task { child_x = child.ax + (child.test(ALIGN_RIGHT) ? gap_x : !child.test(ALIGN_LEFT) ? gap_x / 2 : 0); child_y = child.ay + (child.test(ALIGN_BOTTOM) ? gap_y : !child.test(ALIGN_TOP) ? gap_y / 2 : 0); } else { - int unbounded; + int diff; //#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; + // child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp \ + // numregions/numregions_v regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v + child_x = 0; + if (cols == 1) { + child_width = width; + } else { + child_width = 0; + for(int r=0; r 0) + child.place(); } @@ -378,7 +407,6 @@ public final class Box extends JSScope implements Scheduler.Task { if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null) buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : fillcolor); - // FIXME: do aspect in here if (texture != null && texture.isLoaded) for(int x = globalx; x < cx2; x += texture.width) for(int y = globaly; y < cy2; y += texture.height) @@ -389,8 +417,7 @@ public final class Box extends JSScope implements Scheduler.Task { int gap_y = height - font.textheight(text); int text_x = globalx + (test(ALIGN_RIGHT) ? gap_x : !test(ALIGN_LEFT) ? gap_x/2 : 0); int text_y = globaly + (test(ALIGN_BOTTOM) ? gap_y : !test(ALIGN_TOP) ? gap_y/2 : 0); - if (font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2, null) == -1) - font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2, this); + font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2); } for(Box b = getChild(0); b != null; b = b.nextSibling()) @@ -400,33 +427,30 @@ public final class Box extends JSScope implements Scheduler.Task { // Methods to implement org.ibex.js.JS ////////////////////////////////////// - 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 callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn { - if (nargs != 1 || !"indexof".equals(method)) return super.callMethod(method, a0, a1, a2, rest, nargs); - Box b = (Box)a0; - if (b.parent != this) - return (redirect == null || redirect == this) ? - N(-1) : - redirect.callMethod(method, a0, a1, a2, rest, nargs); - return N(b.getIndexInParent()); - } + switch (nargs) { + case 1: { + //#switch(method) + case "indexof": + Box b = (Box)a0; + if (b.parent != this) + return (redirect == null || redirect == this) ? + N(-1) : + redirect.callMethod(method, a0, a1, a2, rest, nargs); + return N(b.getIndexInParent()); + + case "distanceto": + Box b = (Box)a0; + JS ret = new JS(); + ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0))); + ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0))); + return ret; - public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } - - protected boolean isTrappable(Object key, boolean isRead) { - if (key == null) return false; - else if (key instanceof String) { - // not allowed to trap box properties, and no read traps on events - String name = (String)key; - for (int i=0; i < props.length; i++) if (name.equals(props[i])) return false; - if (isRead) for (int i=0; i < events.length; i++) if (name.equals(events[i])) return false; + //#end + } } - - return true; + return super.callMethod(method, a0, a1, a2, rest, nargs); } public Object get(Object name) throws JSExn { @@ -436,6 +460,7 @@ public final class Box extends JSScope implements Scheduler.Task { //#switch(name) case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); case "indexof": return METHOD; + case "distanceto": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); case "fill": return colorToString(fillcolor); @@ -450,14 +475,14 @@ public final class Box extends JSScope implements Scheduler.Task { case "hshrink": return B(test(HSHRINK)); case "vshrink": return B(test(VSHRINK)); case "aspect": return N(aspect); - case "x": return (parent == null || !test(VISIBLE)) ? N(0) : N(x); - case "y": return (parent == null || !test(VISIBLE)) ? N(0) : N(y); + case "x": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(x) : N(ax); + case "y": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(y) : N(ay); case "cols": return test(FIXED) == COLS ? N(cols) : N(0); case "rows": return test(FIXED) == ROWS ? N(rows) : N(0); case "colspan": return N(colspan); case "rowspan": return N(rowspan); - case "width": return N(width); - case "height": return N(height); + case "width": getRoot().reflow(); return N(width); + case "height": getRoot().reflow(); return N(height); case "minwidth": return N(minwidth); case "maxwidth": return N(maxwidth); case "minheight": return N(minheight); @@ -494,90 +519,87 @@ public final class Box extends JSScope implements Scheduler.Task { } } - void setMaxWidth(Object value) { - do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); - if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; - } - void setMaxHeight(Object value) { - do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); - if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight; + //#repeat setWidth/setHeight minwidth/minheight maxwidth/maxheight pendingWidth/pendingHeight + public void setWidth(int min, int max) { + // FIXME: deal with conflicting min/max + if (this.minwidth == min && this.maxwidth == max) return; + this.minwidth = min; + this.maxwidth = max; + RECONSTRAIN(); + if (parent != null || getSurface() == null) return; + getSurface().pendingWidth = maxwidth; + + // FIXME: the repeat doesn't work right here + getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight); } + //#end public void put(Object name, Object value) throws JSExn { if (name instanceof Number) { put(toInt(name), value); return; } //#switch(name) - case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty(); - case "strokecolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty(); - case "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty(); - case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty(); - case "strokewidth": CHECKSET_SHORT(strokewidth); dirty(); - case "shrink": put("hshrink", value); put("vshrink", value); - case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE; - case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE; - case "width": put("maxwidth", value); put("minwidth", value); MARK_RESIZE; - case "height": put("maxheight", value); put("minheight", value); MARK_RESIZE; - case "maxwidth": setMaxWidth(value); - case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE; - if (parent == null && getSurface() != null) - getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight); - case "maxheight": setMaxHeight(value); - case "minheight": CHECKSET_INT(minheight); MARK_RESIZE; - if (parent == null && getSurface() != null) - getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight); - case "colspan": CHECKSET_SHORT(colspan); MARK_REPACK_parent; - case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent; - case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK; - case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK; - case "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty(); - case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty(); - case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent; - case "aspect": CHECKSET_INT(aspect); dirty(); - case "globalx": put("x", N(globalToLocalX(toInt(value)))); - case "globaly": put("y", N(globalToLocalY(toInt(value)))); - case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); MARK_RESIZE; - case "cursor": setCursor(value); - case "fill": setFill(value); + case "thisbox": if (value == null) removeSelf(); + case "text": if (value == null) value = ""; CHECKSET_STRING(text); RECONSTRAIN(); DIRTY; + case "strokecolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); DIRTY; + case "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); DIRTY; + case "strokewidth": CHECKSET_SHORT(strokewidth); DIRTY; + case "shrink": CHECKSET_FLAG(HSHRINK | VSHRINK); RECONSTRAIN(); + case "hshrink": CHECKSET_FLAG(HSHRINK); RECONSTRAIN(); + case "vshrink": CHECKSET_FLAG(VSHRINK); RECONSTRAIN(); + case "width": setWidth(toInt(value), toInt(value)); + case "height": setHeight(toInt(value), toInt(value)); + case "maxwidth": setWidth(minwidth, toInt(value)); + case "minwidth": setWidth(toInt(value), maxwidth); + case "maxheight": setHeight(minheight, toInt(value)); + case "minheight": setHeight(toInt(value), maxheight); + case "colspan": if (toInt(value) > 0) { CHECKSET_SHORT(colspan); if (parent != null) parent.REPACK(); } + case "rowspan": if (toInt(value) > 0) { CHECKSET_SHORT(rowspan); if (parent != null) parent.REPACK(); } + case "visible": CHECKSET_FLAG(VISIBLE); RECONSTRAIN(); DIRTY; + case "packed": CHECKSET_FLAG(PACKED); if (parent != null) { parent.REPACK(); } else { REPACK(); } + case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); REPLACE(); + case "cursor": setCursor(value); + case "fill": setFill(value); + case "clip": CHECKSET_FLAG(CLIP); if (parent == null) DIRTY; else parent.DIRTY; + case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); REPACK(); + case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); REPACK(); + + // FIXME: remove case "mouse": int mousex = toInt(((JS)value).get("x")); int mousey = toInt(((JS)value).get("y")); getSurface()._mousex = localToGlobalX(mousex); getSurface()._mousey = localToGlobalY(mousey); + case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value); // FEATURE case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE - case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true); + case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true); case "redirect": - for(Box cur = (Box)value; cur != null; cur = cur.parent) - if (cur == redirect) { - redirect = (Box)value; - return; - } + for(Box cur = (Box)value; cur != null || cur == redirect; cur = cur.parent) + if (cur == redirect) { redirect = (Box)value; return; } JS.error("redirect can only be set to a descendant of its current value"); + case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); RECONSTRAIN(); DIRTY; case "font": if(!(value instanceof Stream)) throw new JSExn("You can only put streams to the font property"); + if (font == value) return; // FIXME: unclone() font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize); - MARK_RESIZE; - dirty(); - case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); MARK_RESIZE; dirty(); + RECONSTRAIN(); + DIRTY; case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; - dirty(); CHECKSET_INT(ax); - dirty(); MARK_RESIZE; - dirty(); + CHECKSET_INT(ax); + REPLACE(); } case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; - dirty(); CHECKSET_INT(ay); - dirty(); MARK_RESIZE; - dirty(); + CHECKSET_INT(ay); + REPLACE(); } - case "titlebar": - if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value)); - super.put(name,value); - + case "titlebar": if (getSurface()!=null) getSurface().setTitleBarText(toString(value)); super.put(name,value); + // FIXME: icon + case "Press1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); case "Press2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); case "Press3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); @@ -593,7 +615,6 @@ public final class Box extends JSScope implements Scheduler.Task { case "KeyPressed": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); case "KeyReleased": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); case "Move": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); - case "HScroll": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize()))); case "VScroll": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) @@ -617,15 +638,11 @@ public final class Box extends JSScope implements Scheduler.Task { case "_HScroll": propagateDownward(name, value, false); case "_VScroll": propagateDownward(name, value, false); - case "PosChange": return; case "SizeChange": return; - case "childadded": return; - case "childremoved": return; + case "ChildChange": return; case "Enter": return; case "Leave": return; - case "thisbox": if (value == null) removeSelf(); - default: super.put(name, value); //#end } @@ -646,8 +663,8 @@ public final class Box extends JSScope implements Scheduler.Task { } private void setAlign(Object value) { + clear(ALIGNS); //#switch(value) - case "center": clear(ALIGNS); case "topleft": set(ALIGN_TOP | ALIGN_LEFT); case "bottomleft": set(ALIGN_BOTTOM | ALIGN_LEFT); case "topright": set(ALIGN_TOP | ALIGN_RIGHT); @@ -666,32 +683,34 @@ public final class Box extends JSScope implements Scheduler.Task { set(CURSOR); boxToCursor.put(this, value); Surface surface = getSurface(); - if (surface != null) { - String tempcursor = surface.cursor; - propagateDownward(null, null, false); - if (surface.cursor != tempcursor) surface.syncCursor(); - } + if (surface == null) return; + String tempcursor = surface.cursor; + propagateDownward(null, null, false); + if (surface.cursor != tempcursor) surface.syncCursor(); } private void setFill(Object value) throws JSExn { if (value == null) { - // FIXME: Check this... does this make it transparent? + if (texture == null && fillcolor == 0) return; texture = null; fillcolor = 0; } else if (value instanceof String) { - // FIXME check double set int newfillcolor = stringToColor((String)value); if (newfillcolor == fillcolor) return; fillcolor = newfillcolor; - } else if(value instanceof JS) { - texture = Picture.load((JS)value, this); + texture = null; + } else if (value instanceof JS) { + Picture newtex = Picture.load((JS)value, this); + if (texture == newtex) return; + texture = newtex; + fillcolor = 0; + if (texture != null && texture.isLoaded) perform(); } else { throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass()); } - dirty(); + DIRTY; } - // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down /** * Handles events which propagate down the box tree. If obscured * is set, then we merely check for Enter/Leave. @@ -737,7 +756,7 @@ public final class Box extends JSScope implements Scheduler.Task { } if (!obscured && !found) - if ("_Move".equals(name) || wasinside) + if ("_Move".equals(name) || name.startsWith("_Release") || wasinside) if (name != null) putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); } @@ -800,6 +819,17 @@ public final class Box extends JSScope implements Scheduler.Task { // Trivial Helper Methods (should be inlined) ///////////////////////////////////////// + void mark_for_repack() { REPACK(); } + public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } + public Box getRoot() { return parent == null ? this : parent.getRoot(); } + public Surface getSurface() { return Surface.fromBox(getRoot()); } + Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } + Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } + 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); } + static short min(short a, short b) { if (a treeSize()) return; Box b = getChild(i); removeChild(i); - putAndTriggerTrapsAndCatchExceptions("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } else { Box b = (Box)value; @@ -899,11 +929,11 @@ public final class Box extends JSScope implements Scheduler.Task { b.parent = this; // need both of these in case child was already uncalc'ed - MARK_REFLOW_b; - MARK_REFLOW; + b.RECONSTRAIN(); + RECONSTRAIN(); - b.dirty(); - putAndTriggerTrapsAndCatchExceptions("childadded", b); + b.DIRTY; + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } } @@ -926,45 +956,3 @@ public final class Box extends JSScope implements Scheduler.Task { - /* - 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 - */ - - - /* - 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)); - } -*/ - - -/* - 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); -*/