X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2FBox.java;h=be1c4f437b23c49e3a1618739ab1001d40401d70;hb=51019e05f0459a8a1701f7407ee9ee6d51d61c74;hp=1f0da15a6c0c4332af9580f365b3aaa8d046a5f6;hpb=e0df0b5c56f582587220a134122a07b98b831067;p=org.ibex.core.git
diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index 1f0da15..be1c4f4 100644
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -2,13 +2,16 @@
// 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,26 +27,21 @@ import org.ibex.translators.*;
*
*
The rendering process consists of four phases; each requires
* one DFS pass over the tree
- * - repacking: children of a box are packed into columns
- * and rows according to their colspan/rowspan attributes and
- * ordering.
- *
- reconstraining: Minimum and maximum sizes of columns are computed.
- *
- resizing: width/height and x/y positions of children
- * are assigned, and PosChange/SizeChanges are triggered.
- *
- repainting: children draw their content onto the PixelBuffer.
+ *
- pack(): each box sets its childrens' row/col
+ *
- constrain(): contentwidth is computed
+ *
- resize(): width/height and x/y positions are set
+ *
- 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
-
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); }
@@ -56,37 +54,11 @@ public final class Box extends JSScope implements Scheduler.Task {
protected Box() { super(null); }
- static Hash boxToCursor = new Hash(500, 3); // FIXME memory leak
- 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 memory leak
+ static Hash boxToCursor = new Hash(500, 3);
+
+ static final Font DEFAULT_FONT = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10);
- // 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", "ChildChange",
- "KeyPressed", "KeyReleased", "SizeChange",
- "Focused", "Maximized", "Minimized", "Close"
- };
// Flags //////////////////////////////////////////////////////////////////////
@@ -133,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;
@@ -145,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;
@@ -171,8 +143,8 @@ public final class Box extends JSScope implements Scheduler.Task {
public void perform() throws JSExn {
if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
if (texture.isLoaded) {
- setMinWidth(max(texture.width, minwidth));
- setMinHeight(max(texture.height, minheight));
+ setMinWidth(max(texture.width, maxwidth));
+ setMinHeight(max(texture.height, maxheight));
DIRTY; }
else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
}
@@ -199,6 +171,9 @@ 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(); }
+
private static Box[] frontier = new Box[65535];
/** pack the boxes into rows and columns, compute contentwidth */
void pack() {
@@ -251,7 +226,7 @@ public final class Box extends JSScope implements Scheduler.Task {
set(REPLACE); // FIXME: be smarter / more incremental
}
- void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
+ 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;
int thisx = parent == null ? 0 : this.x;
@@ -478,18 +453,6 @@ public final class Box extends JSScope implements Scheduler.Task {
return super.callMethod(method, a0, a1, a2, rest, nargs);
}
- 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;
- }
-
- return true;
- }
-
public Object get(Object name) throws JSExn {
if (name instanceof Number)
return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name);
@@ -518,8 +481,8 @@ public final class Box extends JSScope implements Scheduler.Task {
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);
@@ -556,70 +519,70 @@ public final class Box extends JSScope implements Scheduler.Task {
}
}
- public void setMaxWidth(Object value) {
- do { CHECKSET_INT(maxwidth); RECONSTRAIN(); } while(false);
- if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth;
- }
- public void setMaxHeight(Object value) {
- do { CHECKSET_INT(maxheight); RECONSTRAIN(); } 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;
- private void setMinWidth(int m) { if (this.minwidth != m) { RECONSTRAIN(); this.minwidth = m; } }
- private void setMinHeight(int m) { if (this.minheight != m) { RECONSTRAIN(); this.minheight = m; } }
+ // 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": if (value == null) value = ""; CHECKSET_STRING(text); RECONSTRAIN(); DIRTY;
+ 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 "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); DIRTY;
case "strokewidth": CHECKSET_SHORT(strokewidth); DIRTY;
- case "shrink": put("hshrink", value); put("vshrink", value);
- case "hshrink": CHECKSET_FLAG(HSHRINK); RECONSTRAIN();
- case "vshrink": CHECKSET_FLAG(VSHRINK); RECONSTRAIN();
- case "width": put("maxwidth", value); put("minwidth", value);
- case "height": put("maxheight", value); put("minheight", value);
- case "maxwidth": setMaxWidth(value);
- case "minwidth": CHECKSET_INT(minwidth); RECONSTRAIN();
- if (parent == null && getSurface() != null)
- getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight);
- case "maxheight": setMaxHeight(value);
- case "minheight": CHECKSET_INT(minheight); RECONSTRAIN();
- if (parent == null && getSurface() != null)
- getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != 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 "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();
- case "clip": CHECKSET_FLAG(CLIP); if (parent == null) DIRTY; else parent.DIRTY;
- case "visible": CHECKSET_FLAG(VISIBLE); RECONSTRAIN(); DIRTY;
- case "packed": CHECKSET_FLAG(PACKED); if (parent != null) parent.REPACK();
- case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); REPLACE();
- case "cursor": setCursor(value);
- case "fill": setFill(value);
+
+ // 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":
- if (value == null) { redirect = null; return; }
- 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);
RECONSTRAIN();
DIRTY;
- case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); RECONSTRAIN(); DIRTY;
case "x": if (parent==null && Surface.fromBox(this)!=null) {
CHECKSET_INT(x);
} else {
@@ -634,9 +597,8 @@ public final class Box extends JSScope implements Scheduler.Task {
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);
@@ -653,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)
@@ -682,8 +643,6 @@ public final class Box extends JSScope implements Scheduler.Task {
case "Enter": return;
case "Leave": return;
- case "thisbox": if (value == null) removeSelf();
-
default: super.put(name, value);
//#end
}
@@ -704,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);
@@ -724,25 +683,27 @@ 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());
@@ -750,7 +711,6 @@ public final class Box extends JSScope implements Scheduler.Task {
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.
@@ -996,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);
-*/