X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=bbfad254b465d6e0bb7e1e4f0f879291e2e97ba8;hp=f680f20ff5b9a3531a2e9c5be2a40b5268ae7f53;hb=c9c75398e998bd9d1dce22509c2b3dea9de63ec4;hpb=5de59cbabd2184a23380fee1bdf32e52c5bb44d7 diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java index f680f20..bbfad25 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 ////////////////////////////////////////////////////////////////////// @@ -187,9 +183,6 @@ public final class Box extends JSScope implements Scheduler.Task { 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 void dirty() { dirty(0, 0, width, height); } @@ -212,69 +205,59 @@ 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]; - - 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(); } + // worst case runtime = O(numboxes * numboxes_in_widest_row) + + private static Box[] frontier = new Box[65535]; // FIXME: GC hazard /** pack the boxes into rows and columns; also computes contentwidth */ - void repack() { - 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; - 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=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; - } + void pack() { + for(Box child = getChild(0); child != null; child = child.nextSibling()) child.pack(); + int frontier_size = 0; contentwidth = 0; contentheight = 0; + //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan \ + // contentheight/contentwidth contentwidth/contentheight + if (treeSize() > 0 && test(FIXED) == COLS) { + rows = 0; + for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (!child.test(PACKED) || !child.test(VISIBLE)) 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 i)) - rowcontentwidth += child.contentwidth; - contentwidth = max(contentwidth, rowcontentwidth); - } - contentwidth = bound(minwidth, max(font == null || text == null ? 0 : font.textwidth(text), contentwidth), maxwidth); - //#end + solve(true); + //#repeat contentwidth/contentheight contentheight/contentwidth minwidth/minheight row/col col/row \ + // textwidth/textheight maxwidth/maxheight cols/rows rows/cols colspan/rowspan rowspan/colspan + contentwidth = bound(minwidth, + max(contentwidth, + font == null || text == null ? 0 : font.textwidth(text)), + maxwidth); + //#end } void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { if (x != this.x || y != this.y || width != this.width || height != this.height) { boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null; - boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; - //do { + do { int thisx = parent == null ? 0 : this.x; int thisy = parent == null ? 0 : this.y; - - // we can't reenable this until we track - // surface-relative sizes; imagine the case of a clear - // surface with nonclear children - - /* - if (texture == null && (text == null || text.equals(""))) { + // we can't reenable this until we track surface-relative sizes; imagine clear surface with nonclear children + if (false /*texture == null && (text == null || text.equals(""))*/) { if ((fillcolor & 0xff000000) == 0) break; - // FEATURE: more optimizations here if (this.x == x && this.y == y) { Box who = (parent == null ? this : parent); who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height)); @@ -282,76 +265,72 @@ public final class Box extends JSScope implements Scheduler.Task { break; } } - */ (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height); this.width = width; this.height = height; this.x = x; this.y = y; dirty(); - //} while (false); - //this.width = width; this.height = height; this.x = x; this.y = y; + } while (false); + this.width = width; this.height = height; this.x = x; this.y = y; if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T); - if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T); } } private static float[] coeff = null; - private static LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex(100, 100, 300); - private static LinearProgramming.Simplex lp = new LinearProgramming.Simplex(100, 100, 300); - boolean[] breakpoints = new boolean[65535]; - int[] regions = new int[65535]; - int[] regions_v = new int[65535]; + private static Simplex lp_h = new Simplex(65535, 65535, 65535); + private static Simplex lp = new Simplex(65535, 65535, 65535); + + private static int[] regions = new int[65535]; + private static int[] regions_v = new int[65535]; + private static int numregions = 0; + private static int numregions_v = 0; + //#repeat col/row colspan/rowspan contentwidth/contentheight width/height HSHRINK/VSHRINK numregions/numregions_v \ + // maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp lp_h/lp easy_width/easy_height regions/regions_v \ + // computeRegions/computeRegions_v + private void computeRegions() { + 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 1) do { - /* boolean easy_width = contentwidth >= width; */ - for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) { - breakpoints[c.col] = true; - breakpoints[min(cols, c.col+c.colspan)] = true; - } - numregions = 0; - // FIXME: depends on cols - for(int i=0; i i && c.maxwidth < Integer.MAX_VALUE) - good = false; - if (good) { easy_width = true; break; } - } - if (easy_width) break; - */ - int nc = numregions * 2 + numkids + 1; + // maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp lp_h/lp easy_width/easy_height regions/regions_v \ + // computeRegions/computeRegions_v + if (numkids > 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= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) coeff[r] = (float)(regions[r+1] - regions[r]); - lp_h.add_constraint(coeff, LinearProgramming.GE, (float)child.contentwidth); - - // 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, LinearProgramming.LE, (float)child_maxwidth); + 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++; } - // priority 3: equalize columns - float avg = ((float)width)/((float)numregions); - for(int r=0; r= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) { + 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) { + 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 - min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth)); + 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 = min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth); + child_width -= diff; //#end } child.resize(child_x, child_y, child_width, child_height); @@ -440,7 +426,7 @@ public final class Box extends JSScope implements Scheduler.Task { for(Box child = getChild(0); child != null; child = child.nextSibling()) if (child.test(VISIBLE) && child.treeSize() > 0) - child.place_children(); + child.place(); } @@ -476,8 +462,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()) @@ -487,11 +472,7 @@ 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 { switch (nargs) { case 1: { @@ -517,8 +498,6 @@ public final class Box extends JSScope implements Scheduler.Task { return super.callMethod(method, a0, a1, a2, rest, nargs); } - 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) { @@ -553,8 +532,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); @@ -597,11 +576,11 @@ public final class Box extends JSScope implements Scheduler.Task { } } - void setMaxWidth(Object value) { + 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; } @@ -627,8 +606,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(); @@ -721,10 +700,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; @@ -842,7 +819,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); } @@ -905,6 +882,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; @@ -1008,7 +996,7 @@ public final class Box extends JSScope implements Scheduler.Task { MARK_REFLOW; b.dirty(); - putAndTriggerTrapsAndCatchExceptions("childadded", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } }