X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=b3f5fd4973a7c47214c4cb14baeef34d8a48107e;hp=2109cb96a872783ca57a7584a661bf36bbecfa26;hb=707b1064f56e88db0cf555a99cb4aa224484f51a;hpb=e1782beec75c1ea0b8faaa429643ed8af5034c6a diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java index 2109cb9..b3f5fd4 100644 --- a/src/org/ibex/Box.java +++ b/src/org/ibex/Box.java @@ -1,5 +1,5 @@ // 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 @@ -54,13 +54,11 @@ public final class Box extends JSScope implements Scheduler.Task { //#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); } - static Hash boxToCursor = new Hash(500, 3); + static Hash boxToCursor = new Hash(500, 3); // FIXME memory leak public static final int MAX_LENGTH = Integer.MAX_VALUE; static final Font DEFAULT_FONT; @@ -87,11 +85,9 @@ public final class Box extends JSScope implements Scheduler.Task { "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" + "Enter", "Leave", "Move", "ChildChange", + "KeyPressed", "KeyReleased", "SizeChange", + "Focused", "Maximized", "Minimized", "Close" }; // Flags ////////////////////////////////////////////////////////////////////// @@ -120,13 +116,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 | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP | MOVED; private String text = null; private Font font = DEFAULT_FONT; @@ -172,24 +169,11 @@ public final class Box extends JSScope implements Scheduler.Task { /** 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) { setMinWidth(max(texture.width, maxwidth)); setMinHeight(max(texture.height, maxheight)); } + 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,113 +196,183 @@ 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) do { + computeRegions(); + int nc = numregions * 3 + numkids * 2 + 3; + if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1]; + lp_h.init(nc); + + 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; + lp_h.setObjective(coeff, false); + + // priority 1: sum of columns as close to parent's width as possible + for(int i=0; i= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + coeff[r] = (float)(regions[r+1] - regions[r]); + lp_h.add_constraint(coeff, Simplex.GE, (float)child.contentwidth); + if (!findMinimum) { + // priority 2: honor maxwidths + int child_maxwidth = child.test(HSHRINK) ? min(child.maxwidth, child.contentwidth) : child.maxwidth; + if (child_maxwidth < Integer.MAX_VALUE) { + for(int i=0; i= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + coeff[r] = (float)(regions[r+1] - regions[r]); + coeff[numregions*2+childnum] = (float)-1.0; + lp_h.add_constraint(coeff, Simplex.LE, (float)child_maxwidth); + } + } + childnum++; + } + + if (!findMinimum) { + // priority 3: equalize columns + float avg = ((float)width)/((float)numregions); + for(int r=0; r 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 + child_width = 0; + child_x = 0; + if (cols == 1) { + child_x = 0; + child_width = width; + } else { + for(int r=0; r= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + child_width += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r])); + else if (regions[r+1] <= child.col) + child_x += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r])); + } + diff = (child_width - (child.test(HSHRINK) ? child.contentwidth : min(child_width, child.maxwidth))); + child_x += (child.test(ALIGN_RIGHT) ? diff : child.test(ALIGN_LEFT) ? 0 : diff / 2); + child_width -= diff; //#end } + if (test(MOVED)) child.set(MOVED); child.resize(child_x, child_y, child_width, child_height); } - - // cleanup - for(int i=0; i 0) + child.place(); } @@ -389,8 +451,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,22 +461,31 @@ 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()); } + //#end + } + } + return super.callMethod(method, a0, a1, a2, rest, nargs); + } protected boolean isTrappable(Object key, boolean isRead) { if (key == null) return false; @@ -436,6 +506,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,8 +521,8 @@ 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); @@ -494,11 +565,19 @@ public final class Box extends JSScope implements Scheduler.Task { } } - void setMaxWidth(Object value) { + public void setMinWidth(int minwidth) { + if (this.minwidth == minwidth) return; + MARK_RESIZE; MARK_REFLOW; MARK_REPACK; this.minwidth = minwidth; + } + public void setMinHeight(int minheight) { + if (this.minheight == minheight) return; + MARK_RESIZE; MARK_REFLOW; MARK_REPACK; this.minheight = minheight; + } + public void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); - if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; + if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; } - void setMaxHeight(Object value) { + public void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight; } @@ -524,8 +603,8 @@ public final class Box extends JSScope implements Scheduler.Task { 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 "colspan": if (toInt(value) <= 0) return; CHECKSET_SHORT(colspan); MARK_REPACK_parent; + case "rowspan": if (toInt(value) <= 0) return; 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(); @@ -546,6 +625,7 @@ public final class Box extends JSScope implements Scheduler.Task { case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true); case "redirect": + if (value == null) { redirect = null; return; } for(Box cur = (Box)value; cur != null; cur = cur.parent) if (cur == redirect) { redirect = (Box)value; @@ -617,10 +697,8 @@ 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; @@ -685,6 +763,7 @@ public final class Box extends JSScope implements Scheduler.Task { fillcolor = newfillcolor; } else if(value instanceof JS) { texture = Picture.load((JS)value, this); + if (texture != null && texture.isLoaded) perform(); } else { throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass()); } @@ -737,7 +816,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 +879,17 @@ public final class Box extends JSScope implements Scheduler.Task { // Trivial Helper Methods (should be inlined) ///////////////////////////////////////// + void mark_for_repack() { MARK_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; @@ -903,7 +993,7 @@ public final class Box extends JSScope implements Scheduler.Task { MARK_REFLOW; b.dirty(); - putAndTriggerTrapsAndCatchExceptions("childadded", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } }