X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FBox.java;h=b6dcdf57fabaadd1b064c84ba048ffd61bc0edd2;hp=c898d8e1cfb502749b2aa88234e56013cedfa506;hb=281809f6b87f0abc7b944795c05b1131a4495895;hpb=4daeeb4119b901d53b44913c86f8af3ce67db925 diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java index c898d8e..b6dcdf5 100644 --- a/src/org/ibex/core/Box.java +++ b/src/org/ibex/core/Box.java @@ -1,6 +1,9 @@ +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the GNU General Public License version 2 ("the License"). +// You may not use this file except in compliance with the License. + // FIXME -// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] -package org.ibex; +package org.ibex.core; // 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? @@ -17,7 +20,7 @@ package org.ibex; import java.util.*; import org.ibex.js.*; import org.ibex.util.*; -import org.ibex.translators.*; +import org.ibex.graphics.*; /** *
@@ -38,7 +41,9 @@ import org.ibex.translators.*;
* 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 {
+public final class Box extends JS.Obj implements Callable {
+
+ private static final JS.Method METHOD = new JS.Method();
// Macros //////////////////////////////////////////////////////////////////////
@@ -46,18 +51,16 @@ public final class Box extends JSScope implements Scheduler.Task {
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&&JS.toString(value).equals(prop))) break; prop=JS.toString(value);
-
- protected Box() { super(null); }
+ //#define CHECKSET_SHORT(prop) short nu = (short)JSU.toInt(value); if (nu == prop) break; prop = nu;
+ //#define CHECKSET_INT(prop) int nu = JSU.toInt(value); if (nu == prop) break; prop = nu;
+ //#define CHECKSET_FLAG(flag) boolean nu = JSU.toBoolean(value); if (nu == test(flag)) break; if (nu) set(flag); else clear(flag);
+ //#define CHECKSET_BOOLEAN.N(prop) boolean nu = JSU.toBoolean(value); if (nu == prop) break; prop = nu;
+ //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JSU.toString(value).equals(prop))) break; prop=JSU.toString(value);
// FIXME memory leak
- static Hash boxToCursor = new Hash(500, 3);
+ static Basket.Map boxToCursor = new Basket.Hash(500, 3);
- static final Font DEFAULT_FONT = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10);
+ public static final Font DEFAULT_FONT = Font.getFont(Main.vera, 10);
// Flags //////////////////////////////////////////////////////////////////////
@@ -65,8 +68,8 @@ public final class Box extends JSScope implements Scheduler.Task {
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;
+ public static final int HSHRINK = 0x00000008;
+ public static final int VSHRINK = 0x00000010;
static final int BLACK = 0x00000020; // for red-black code
static final int FIXED = 0x00000040;
@@ -78,11 +81,6 @@ public final class Box extends JSScope implements Scheduler.Task {
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;
- 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 CLIP = 0x00020000;
static final int STOP_UPWARD_PROPAGATION = 0x00040000;
@@ -95,6 +93,8 @@ public final class Box extends JSScope implements Scheduler.Task {
Box redirect = this;
int flags = VISIBLE | PACKED | REPACK | RECONSTRAIN | REPLACE | FIXED | STOP_UPWARD_PROPAGATION | CLIP | MOVED;
+ private BalancedTree bt;
+
private String text = null;
private Font font = DEFAULT_FONT;
private Picture texture = null;
@@ -109,6 +109,10 @@ public final class Box extends JSScope implements Scheduler.Task {
public int maxwidth = Integer.MAX_VALUE;
public int minheight = 0;
public int maxheight = Integer.MAX_VALUE;
+ public int minwidth() { return minwidth; }
+ public int minheight() { return minheight; }
+ public int maxwidth() { return maxwidth; }
+ public int maxheight() { return maxheight; }
private short rows = 1;
private short cols = 0;
private short rowspan = 1;
@@ -123,30 +127,29 @@ public final class Box extends JSScope implements Scheduler.Task {
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;
+ public int contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth))
+ public int contentheight = 0;
+ private Path path = null;
/*
- private VectorGraphics.VectorPath path = null;
- private VectorGraphics.Affine transform = null;
+ private Affine transform = null;
private VectorGraphics.RasterPath rpath = null;
- private VectorGraphics.Affine rtransform = null;
+ private 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 {
- if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
+ public Object run(Object o) throws JSExn {
+ if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return null; }
if (texture.isLoaded) {
- setWidth(max(texture.width, maxwidth), maxwidth);
- setHeight(max(texture.height, maxheight), maxheight);
- DIRTY; }
+ setWidth(max(texture.width, minwidth), maxwidth);
+ setHeight(max(texture.height, minheight), maxheight);
+ dirty(); }
else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
+ return null;
}
// FEATURE: use cx2/cy2 format
@@ -172,11 +175,17 @@ public final class Box extends JSScope implements Scheduler.Task {
// Reflow ////////////////////////////////////////////////////////////////////////////////////////
/** should only be invoked on the root box */
- void reflow() { pack(); resize(x, y, maxwidth, maxheight); place(); }
-
+ public void reflow() {
+ pack();
+ resize(x, y,
+ test(HSHRINK) ? contentwidth : maxwidth,
+ test(VSHRINK) ? contentheight : maxheight);
+ place();
+ }
+
private static Box[] frontier = new Box[65535];
/** pack the boxes into rows and columns, compute contentwidth */
- void pack() {
+ public void pack() {
if (!test(REPACK)) { constrain(); return; }
boolean haskid = false;
for(Box child = getChild(0); child != null; child = child.nextSibling()) { haskid = true; child.pack(); }
@@ -226,9 +235,12 @@ public final class Box extends JSScope implements Scheduler.Task {
set(REPLACE); // FIXME: be smarter / more incremental
}
+ private final static JS SIZECHANGE = JSU.S("SizeChange");
+
void resize(int x, int y, int width, int height) {
if (x == this.x && y == this.y && width == this.width && height == this.height) return;
- boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
+ boolean sizechange = (this.width != width || this.height != height);
+ try { sizechange = sizechange && getTrap(SIZECHANGE) != null; } catch (JSExn e) {}
int thisx = parent == null ? 0 : this.x;
int thisy = parent == null ? 0 : this.y;
Box who = (parent == null ? this : parent);
@@ -242,9 +254,9 @@ public final class Box extends JSScope implements Scheduler.Task {
} else {
who.dirty(thisx, thisy, this.width, this.height);
this.width = width; this.height = height; this.x = x; this.y = y;
- DIRTY;
+ dirty();
}
- if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
+ if (sizechange) putAndTriggerTrapsAndCatchExceptions(SIZECHANGE, JSU.T);
}
private float targetColumnSize = (float)0.0;
@@ -352,13 +364,13 @@ public final class Box extends JSScope implements Scheduler.Task {
child_height = max(child.minheight, child_height);
int gap_x = width - child_width;
int gap_y = height - child_height;
- 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);
+ child_x = child.ax + gap_x / 2;
+ child_y = child.ay + gap_y / 2;
} else {
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 \
- // child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp \
+ // child_width/child_height lp_h/lp \
// numregions/numregions_v regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v
child_x = 0;
if (cols == 1) {
@@ -371,7 +383,7 @@ public final class Box extends JSScope implements Scheduler.Task {
}
}
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_x += diff / 2;
child_width -= diff;
//#end
}
@@ -390,7 +402,7 @@ public final class Box extends JSScope implements Scheduler.Task {
// Rendering Pipeline /////////////////////////////////////////////////////////////////////
/** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
- void render(int parentx, int parenty, int cx1, int cy1, int cx2, int cy2, PixelBuffer buf, VectorGraphics.Affine a) {
+ public void render(int parentx, int parenty, int cx1, int cy1, int cx2, int cy2, PixelBuffer buf, Affine a) {
if (!test(VISIBLE)) return;
int globalx = parentx + (parent == null ? 0 : x);
int globaly = parenty + (parent == null ? 0 : y);
@@ -415,107 +427,113 @@ public final class Box extends JSScope implements Scheduler.Task {
if (text != null && !text.equals("") && font != null) {
int gap_x = width - font.textwidth(text);
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);
+ int text_x = globalx + gap_x/2;
+ int text_y = globaly + gap_y/2;
font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2);
}
+ if (path != null) new Polygon(path, Affine.translate(globalx, globaly)).stroke(buf, strokecolor);
+
for(Box b = getChild(0); b != null; b = b.nextSibling())
b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null);
}
// Methods to implement org.ibex.js.JS //////////////////////////////////////
-
- public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
- switch (nargs) {
+ public JS call(JS method, JS[] args) throws JSExn {
+ switch (args.length) {
case 1: {
- //#switch(method)
+ //#switch(JSU.toString(method))
case "indexof":
- Box b = (Box)a0;
+ Box b = (Box)args[0];
if (b.parent != this)
return (redirect == null || redirect == this) ?
- N(-1) :
- redirect.callMethod(method, a0, a1, a2, rest, nargs);
- return N(b.getIndexInParent());
+ JSU.N(-1) : redirect.call(method, args);
+ return JSU.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)));
+ Box b = (Box)args[0];
+ JS ret = new JS.Obj();
+ ret.put(JSU.S("x"), JSU.N(b.localToGlobalX(0) - localToGlobalX(0)));
+ ret.put(JSU.S("y"), JSU.N(b.localToGlobalY(0) - localToGlobalY(0)));
return ret;
//#end
}
}
- return super.callMethod(method, a0, a1, a2, rest, nargs);
+ return super.call(method, args);
}
- public Object get(Object name) throws JSExn {
- if (name instanceof Number)
- return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name);
+ public JS get(JS name) throws JSExn {
+ if (JSU.isInt(name))
+ return redirect == null ? null : redirect == this ? getChild(JSU.toInt(name)) : redirect.get(name);
- //#switch(name)
- case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface");
+ //#switch(JSU.toString(name))
+ case "surface": return parent == null ? null : parent.getAndTriggerTraps(name);
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);
- case "strokecolor": return colorToString(strokecolor);
- case "textcolor": return colorToString(strokecolor);
+ case "text": return JSU.S(text);
+ case "path": {
+ if (path != null) return JSU.S(path.toString());
+ if (text == null) return null;
+ if (font == null) return null;
+ String ret = "";
+ for(int i=0; i