23-Sep megacz SpecialBoxProperty.java: invisible now returns true if
any of the box's ancestors is invisible.
+
+23-Sep megacz SpecialBoxProperty.java, Box.java, Surface.java:
+ expanded dimensions to 32 bits, fixed bug in behavior of
+ hshrink/vshrink, don't deliver events to root first.
/** The maximum <i>defined</i> width and height of this box */
public static final int dmax = 0;
- private short _dmax_0 = 0;
- private short _dmax_1 = 0;
- public final short dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
+ private int _dmax_0 = 0;
+ private int _dmax_1 = 0;
+ public final int dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
/** The minimum <i>defined</i> width and height of this box */
public static final int dmin = 1;
- private short _dmin_0 = 0;
- private short _dmin_1 = 0;
- public final short dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
+ private int _dmin_0 = 0;
+ private int _dmin_1 = 0;
+ public final int dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
/** The minimum <i>calculated</i> width and height of this box -- unlike dmin, this takes childrens' sizes into account */
public static final int cmin = 2;
- private short _cmin_0 = 0;
- private short _cmin_1 = 0;
- public final short cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
+ private int _cmin_0 = 0;
+ private int _cmin_1 = 0;
+ public final int cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
/** The position of this box, relitave to the parent */
public static final int abs = 3;
- private short _abs_0 = 0;
- private short _abs_1 = 0;
- public final short abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
+ private int _abs_0 = 0;
+ private int _abs_1 = 0;
+ public final int abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
/** The absolute position of this box (ie relitave to the root); set by the parent */
public static final int pos = 4;
- private short _pos_0 = 0;
- private short _pos_1 = 0;
- public final short pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
+ private int _pos_0 = 0;
+ private int _pos_1 = 0;
+ public final int pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
/** The actual size of this box; set by the parent. */
public static final int size = 5;
- short _size_0 = 0;
- short _size_1 = 0;
- public final short size(int axis) { return axis == 0 ? _size_0 : _size_1; }
+ int _size_0 = 0;
+ int _size_1 = 0;
+ public final int size(int axis) { return axis == 0 ? _size_0 : _size_1; }
/** The old actual absolute position of this box (ie relitave to the root) */
public static final int oldpos = 6;
- private short _oldpos_0 = 0;
- private short _oldpos_1 = 0;
- public final short oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
+ private int _oldpos_0 = 0;
+ private int _oldpos_1 = 0;
+ public final int oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
/** The old actual size of this box */
public static final int oldsize = 7;
- private short _oldsize_0 = 0;
- private short _oldsize_1 = 0;
- public final short oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
+ private int _oldsize_0 = 0;
+ private int _oldsize_1 = 0;
+ public final int oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
/** The padding along each edge for this box */
public static final int pad = 8;
- private short _pad_0 = 0;
- private short _pad_1 = 0;
- public final short pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
+ private int _pad_0 = 0;
+ private int _pad_1 = 0;
+ public final int pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
/** The dimensions of the text in this box */
public static final int textdim = 9;
- private short _textdim_0 = 0;
- private short _textdim_1 = 0;
- public final short textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
+ private int _textdim_0 = 0;
+ private int _textdim_1 = 0;
+ public final int textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
// Instance Data /////////////////////////////////////////////////////////////////
// Methods which enforce/preserve invariants ////////////////////////////////////////////
/** This method MUST be used to change geometry values -- it ensures that certain invariants are preserved. */
- public final void set(int which, int axis, int newvalue) { set(which, axis, (short)newvalue); }
- public final void set(int which, int axis, short newvalue) {
+ public final void set(int which, int axis, int newvalue) {
// if this Box is the root of the Surface, notify the Surface of size changes
if (getParent() == null && surface != null && which == size)
if (which == dmin) set(size, axis, max(size(axis), newvalue));
if (which == dmax) set(size, axis, min(size(axis), newvalue));
- // keep obedience to shrink directives
- if (which == cmin || which == textdim || which == pad || which == dmin)
- if ((hshrink && axis == 0) || (vshrink && axis == 1))
- set(dmax, axis, max(cmin(axis), (textdim(axis) + 2 * pad(axis)), dmin(axis)));
-
// keep cmin in line with dmin/dmax/textdim
if (which == dmax || which == dmin || which == textdim || which == pad || which == cmin)
set(cmin, axis,
max(
- min(cmin(axis), dmax(axis)),
+ min(dmax(axis), cmin(axis)),
dmin(axis),
min(dmax(axis), textdim(axis) + 2 * pad(axis))
)
/** Ensures that cmin is in sync with the cmin's of our children. This should be called whenever a child is added or
* removed, as well as when our pad is changed. */
final void sync_cmin_to_children() {
- short co = (short)(2 * pad(o));
- short cxo = (short)(2 * pad(xo));
+ int co = (int)(2 * pad(o));
+ int cxo = (int)(2 * pad(xo));
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible || bt.absolute) continue;
co += bt.cmin(o);
- cxo = (short)max(bt.cmin(xo) + 2 * pad(xo), cxo);
+ cxo = (int)max(bt.cmin(xo) + 2 * pad(xo), cxo);
}
set(cmin, o, co);
/** creates a new box from an anonymous template; <tt>ids</tt> is passed through to Template.apply() */
Box(Template anonymous, Vec pboxes, Vec ptemplates, Function callback, int numerator, int denominator) {
super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
template = anonymous;
template.apply(this, pboxes, ptemplates, callback, numerator, denominator);
templatename = null;
public Box(String templatename, String[] importlist) { this(templatename, importlist, null); }
public Box(String templatename, String[] importlist, Function callback) {
super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
this.importlist = importlist;
if (!"box".equals(templatename)) {
template = Template.getTemplate(templatename, importlist);
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible) continue;
if (bt.absolute) {
- bt.set(size, o, max(bt.cmin(o), min(size(o) - bt.abs(o) - pad(o), bt.dmax(o))));
- bt.set(size, xo, max(bt.cmin(xo), min(size(xo) - bt.abs(xo) - pad(xo), bt.dmax(xo))));
+ bt.set(size, 0, bt.hshrink ? bt.cmin(0) : max(bt.cmin(0), min(size(0) - bt.abs(0) - pad(0), bt.dmax(0))));
+ bt.set(size, 1, bt.vshrink ? bt.cmin(1) : max(bt.cmin(1), min(size(1) - bt.abs(1) - pad(1), bt.dmax(1))));
} else if (xo == 0 && bt.hshrink || xo == 1 && bt.vshrink) {
bt.set(size, xo, bt.cmin(xo));
} else {
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.absolute || bt.invisible) continue;
- bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, bt.dmax(o)));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, btmax));
total += bt.size(o);
if (factor * bt.flex < bt.cmin(o) && bt.size(o) == bt.cmin(o)) {
nextjoint = min(nextjoint, divide_round_up(bt.cmin(o), bt.flex));
- } else if (bt.size(o) < bt.dmax(o)) {
+ } else if (bt.size(o) < btmax) {
remaining_flex += bt.flex;
- nextjoint = min(nextjoint, divide_round_up(bt.dmax(o), bt.flex));
+ nextjoint = min(nextjoint, divide_round_up(btmax, bt.flex));
}
}
while(goal != total && total != last) {
last = total;
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
- int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), bt.dmax(o));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), btmax);
total += newsize - bt.size(o);
bt.set(size, o, newsize);
}
boolean newshrink = stob(value);
if (b.hshrink == newshrink && b.vshrink == newshrink) return;
b.hshrink = b.vshrink = newshrink;
- if (b.hshrink) b.set(b.dmax, 0, Box.max(b.cmin(0), b.textdim(0) + 2 * b.pad(0), b.dmin(0)));
- if (b.vshrink) b.set(b.dmax, 1, Box.max(b.cmin(1), b.textdim(1) + 2 * b.pad(1), b.dmin(1)));
+ b.mark_for_prerender();
} });
specialBoxProperties.put("hshrink", new SpecialBoxProperty() {
boolean newshrink = stob(value);
if (b.hshrink == newshrink) return;
b.hshrink = newshrink;
- if (b.hshrink) b.set(b.dmax, 0, Box.max(b.cmin(0), b.textdim(0) + 2 * b.pad(0), b.dmin(0)));
+ b.mark_for_prerender();
}
});
boolean newshrink = stob(value);
if (b.vshrink == newshrink) return;
b.vshrink = newshrink;
- if (b.vshrink) b.set(b.dmax, 1, Box.max(b.cmin(1), b.textdim(1) + 2 * b.pad(1), b.dmin(1)));
+ b.mark_for_prerender();
}
});
b.surface.setLocation(stoi(value), b.abs(1));
b.surface.centerSurfaceOnRender = false;
}
- b.set(abs, 0, stosh(value));
+ b.set(abs, 0, stoi(value));
}
});
b.surface.setLocation(b.abs(0), stoi(value));
b.surface.centerSurfaceOnRender = false;
}
- b.set(abs, 1, stosh(value));
+ b.set(abs, 1, stoi(value));
}
});
public void put(Box b, Object value) {
if (b.sizetoimage) return;
if (b.getParent() == null && b.surface != null) {
- b.set(size, 0, Box.max(Surface.scarPicture.getWidth(), stosh(value)));
+ b.set(size, 0, Box.max(Surface.scarPicture.getWidth(), stoi(value)));
b.mark_for_prerender();
} else {
- b.set(dmax, 0, stosh(value));
- b.set(dmin, 0, stosh(value));
+ b.set(dmax, 0, stoi(value));
+ b.set(dmin, 0, stoi(value));
}
} });
public void put(Box b, Object value) {
if (b.sizetoimage) return;
if (b.getParent() == null && b.surface != null) {
- b.set(size, 1, Box.max(Surface.scarPicture.getHeight(), stosh(value)));
+ b.set(size, 1, Box.max(Surface.scarPicture.getHeight(), stoi(value)));
b.mark_for_prerender();
} else {
- b.set(dmax, 1, stosh(value));
- b.set(dmin, 1, stosh(value));
+ b.set(dmax, 1, stoi(value));
+ b.set(dmin, 1, stoi(value));
}
} });
specialBoxProperties.put("invisible", new SpecialBoxProperty() {
public Object get(Box b) {
- for (Box cur = b; cur != null; cur = cur.getParent()) { if (cur.invisible) return Boolean.TRUE; }
- return Boolean.FALSE;
- }
+ for (Box cur = b; cur != null; cur = cur.getParent()) { if (cur.invisible) return Boolean.TRUE; }
+ return Boolean.FALSE;
+ }
public void put(Box b, Object value) {
boolean newinvisible = stob(value);
if (newinvisible == b.invisible) return;
SpecialBoxProperty mouseEventHandler = new SpecialBoxProperty() {
public void put(String name, Box b, Object value) {
if (b.surface == null) return;
- if (b.getParent() == null) {
- if (b.surface.boxContainingMouse != null && b.surface.boxContainingMouse.getParent() != null)
- b.surface.boxContainingMouse.put(name, b.surface.boxContainingMouse, value);
- } else {
- // check siblings
- for(Box c = b.prevSibling(); c != null; c = c.prevSibling())
- if (c.inside(c.surface.mousex, c.surface.mousey)) {
- c.put(name, c, value);
- return;
- }
- // move up a level
- if (b.getParent() != null && b.getParent().getParent() != null)
- b.getParent().put(name, b.getParent(), value);
- }
+ for(Box c = b.prevSibling(); c != null; c = c.prevSibling())
+ if (c.inside(c.surface.mousex, c.surface.mousey)) {
+ c.put(name, c, value);
+ return;
+ }
+ if (b.getParent() != null)
+ b.getParent().put(name, b.getParent(), value);
}};
specialBoxProperties.put("Press1", mouseEventHandler);
public void put(Box b, Object value) {
if (b.redirect == null) return;
if (b.redirect != b) { put(b.redirect, value); return; }
- short newval = stosh(value);
+ int newval = stoi(value);
if (newval == b.pad(0)) return;
b.set(pad, 0, newval);
}
public void put(Box b, Object value) {
if (b.redirect == null) return;
if (b.redirect != b) { put(b.redirect, value); return; }
- short newval = stosh(value);
+ int newval = stoi(value);
if (newval == b.pad(1)) return;
b.set(pad, 1, newval);
}
public Object get(Box b) { return new Integer(b.dmin(0)); }
public void put(Box b, Object value) {
if (b.sizetoimage) return;
- b.set(dmin, 0, stosh(value));
+ b.set(dmin, 0, stoi(value));
}
});
public Object get(Box b) { return new Integer(b.dmax(0)); }
public void put(Box b, Object value) {
if (b.sizetoimage) return;
- b.set(dmax, 0, stosh(value));
+ b.set(dmax, 0, stoi(value));
}
});
public Object get(Box b) { return new Integer(b.dmin(1)); }
public void put(Box b, Object value) {
if (b.sizetoimage) return;
- b.set(dmin, 1, stosh(value));
+ b.set(dmin, 1, stoi(value));
}
});
public Object get(Box b) { return new Integer(b.dmax(1)); }
public void put(Box b, Object value) {
if (b.sizetoimage) return;
- b.set(dmax, 1, stosh(value));
+ b.set(dmax, 1, stoi(value));
}
});
catch (NumberFormatException e) { return 0; }
}
- /** helper that converts a String to a short according to JavaScript coercion rules */
- public static short stosh(Object o) {
- if (o == null) return 0;
- if (o instanceof Number) return ((Number)o).shortValue();
-
- String s;
- if (!(o instanceof String)) s = o.toString();
- else s = (String)o;
-
- try { return Short.parseShort(s.indexOf('.') == -1 ? s : s.substring(0, s.indexOf('.'))); }
- catch (NumberFormatException e) { return 0; }
- }
-
- /** helper that converts a String to a short according to JavaScript coercion rules */
+ /** helper that converts a String to a int according to JavaScript coercion rules */
private static class Apply extends JSObject.JSFunction {
Box b;
// Public Members and State Variables /////////////////////////////////////////////////////////
- /** this is the box on this surface which the mouse was inside at the time that the currently-executing event was enqueued */
- public Box boxContainingMouse = null;
-
/** false if the surface has never been rendered; used to determine if the surface should be repositioned to be centered on the screen */
public boolean centerSurfaceOnRender = true;
else if (button == 3) {
final Box who = root.whoIs(mousex, mousey);
MessageQueue.add(new Message() { public void perform() {
- Surface.this.boxContainingMouse = who;
Platform.clipboardReadEnabled = true;
root.put("Press3", null, Boolean.TRUE);
Platform.clipboardReadEnabled = false;
protected final void PosChange(int x, int y) {
root.set(Box.abs, 0, x);
root.set(Box.abs, 1, y);
- new SimpleMessage("PosChange", Boolean.TRUE, null);
+ new SimpleMessage("PosChange", Boolean.TRUE, root);
}
- protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, null); }
- protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, null); }
- protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, null); }
- protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, null); }
+ protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, root); }
+ protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, root); }
+ protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, root); }
+ protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); }
public static void Refresh() { MessageQueue.refresh(); }
// the following value is split into two int's to work around GCJ bug java/6393
scarPicture.getWidth(), scarPicture.getHeight());
// sort of ugly; we can't use set() here because it will cause an infinite mutual recursion
- root._size_0 = (short)width;
- root._size_1 = (short)height;
+ root._size_0 = (int)width;
+ root._size_1 = (int)height;
root.mark_for_prerender();
root.put("SizeChange", null, Boolean.TRUE);
MessageQueue.add(this);
}
- public void perform() {
- Surface.this.boxContainingMouse = this.boxContainingMouse;
- root.put(name, root, value);
- }
-
- public String toString() {
- return "SimpleMessage [name=" + name + ", value=" + value + "]";
- }
+ public void perform() { boxContainingMouse.put(name, root, value); }
+ public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
}
projects / org.ibex.core.git / commitdiff