X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FBox.java;h=053357a905394e90f984df20e80c7f7a9b8073a6;hp=c4c9fd8e906df3664945ff46d61e01b0be36ded2;hb=2d6763644359578428d56d004b998edd10463a84;hpb=ed8c8e77f35b69a9084dc5b7327ffb5cbf406cff diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java index c4c9fd8..053357a 100644 --- a/src/org/ibex/core/Box.java +++ b/src/org/ibex/core/Box.java @@ -57,7 +57,11 @@ public final class Box extends JSScope implements Task { // 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); + static final Font DEFAULT_FONT; + static { + try { DEFAULT_FONT = Font.getFont(Main.builtin.get(JS.S("fonts/vera/Vera.ttf")), 10); } + catch(JSExn e) { throw new Error("Error loading default font: " + e); } + } // Flags ////////////////////////////////////////////////////////////////////// @@ -65,8 +69,8 @@ public final class Box extends JSScope implements 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; @@ -123,8 +127,8 @@ public final class Box extends JSScope implements 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; /* @@ -133,8 +137,6 @@ public final class Box extends JSScope implements Task { private Affine rtransform = null; */ - //#define DIRTY dirty() - // Instance Methods ///////////////////////////////////////////////////////////////////// public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; } @@ -145,7 +147,7 @@ public final class Box extends JSScope implements Task { if (texture.isLoaded) { setWidth(max(texture.width, minwidth), maxwidth); setHeight(max(texture.height, minheight), maxheight); - DIRTY; } + dirty(); } else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); } } @@ -172,8 +174,14 @@ public final class Box extends JSScope implements Task { // Reflow //////////////////////////////////////////////////////////////////////////////////////// /** should only be invoked on the root box */ - public 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 */ public void pack() { @@ -226,9 +234,11 @@ public final class Box extends JSScope implements Task { set(REPLACE); // FIXME: be smarter / more incremental } + private final static JS SIZECHANGE = JS.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) && hasTrap(SIZECHANGE); int thisx = parent == null ? 0 : this.x; int thisy = parent == null ? 0 : this.y; Box who = (parent == null ? this : parent); @@ -242,9 +252,9 @@ public final class Box extends JSScope implements 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, T); } private float targetColumnSize = (float)0.0; @@ -430,10 +440,10 @@ public final class Box extends JSScope implements Task { // Methods to implement org.ibex.js.JS ////////////////////////////////////// - public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn { + public JS callMethod(JS method, JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn { switch (nargs) { case 1: { - //#switch(method) + //#jswitch(method) case "indexof": Box b = (Box)a0; if (b.parent != this) @@ -444,9 +454,9 @@ public final class Box extends JSScope implements Task { 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))); + JS ret = new JS.O(); + ret.put(JS.S("x"), N(b.localToGlobalX(0) - localToGlobalX(0))); + ret.put(JS.S("y"), N(b.localToGlobalY(0) - localToGlobalY(0))); return ret; //#end @@ -455,23 +465,30 @@ public final class Box extends JSScope implements Task { return super.callMethod(method, a0, a1, a2, rest, nargs); } - 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 (JS.isInt(name)) + return redirect == null ? null : redirect == this ? getChild(JS.toInt(name)) : redirect.get(name); - //#switch(name) - case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); + //#jswitch(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 Color.colorToString(fillcolor); - case "strokecolor": return Color.colorToString(strokecolor); - case "textcolor": return Color.colorToString(strokecolor); + case "text": return JS.S(text); + case "path": { + if (path != null) return JS.S(path.toString()); + if (text == null) return null; + if (font == null) return null; + String ret = ""; + for(int i=0; i 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 "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 "align": clear(ALIGNS); setAlign(value); REPLACE(); + case "cursor": setCursor(JS.toString(value)); case "fill": setFill(value); - case "clip": CHECKSET_FLAG(CLIP); if (parent == null) DIRTY; else parent.DIRTY; + 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(); // FIXME: remove case "mouse": - int mousex = toInt(((JS)value).get("x")); - int mousey = toInt(((JS)value).get("y")); + int mousex = toInt(((JS)value).get(JS.S("x"))); + int mousey = toInt(((JS)value).get(JS.S("y"))); getSurface()._mousex = localToGlobalX(mousex); getSurface()._mousey = localToGlobalY(mousey); @@ -579,13 +596,13 @@ public final class Box extends JSScope implements Task { 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 "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() + //FIXME: if (font == value) return; // FIXME: unclone() font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize); RECONSTRAIN(); - DIRTY; + dirty(); case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { @@ -619,9 +636,9 @@ public final class Box extends JSScope implements Task { 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()))); + parent.putAndTriggerTraps(name, N(JS.toFloat(value) * ((float)parent.fontSize()) / ((float)fontSize()))); case "VScroll": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) - parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize()))); + parent.putAndTriggerTraps(name, N(JS.toFloat(value) * ((float)parent.fontSize()) / ((float)fontSize()))); case "_Move": propagateDownward(name, value, false); case "_Press1": propagateDownward(name, value, false); @@ -665,9 +682,9 @@ public final class Box extends JSScope implements Task { } } - private void setAlign(Object value) { + private void setAlign(JS value) throws JSExn { clear(ALIGNS); - //#switch(value) + //#jswitch(value) case "topleft": set(ALIGN_TOP | ALIGN_LEFT); case "bottomleft": set(ALIGN_BOTTOM | ALIGN_LEFT); case "topright": set(ALIGN_TOP | ALIGN_RIGHT); @@ -676,11 +693,11 @@ public final class Box extends JSScope implements Task { case "bottom": set(ALIGN_BOTTOM); case "left": set(ALIGN_LEFT); case "right": set(ALIGN_RIGHT); - default: JS.log("invalid alignment \"" + value + "\""); + default: JS.log("invalid alignment \"" + JS.debugToString(value) + "\""); //#end } - private void setCursor(Object value) { + private void setCursor(String value) throws JSExn { if (value == null) { clear(CURSOR); boxToCursor.remove(this); return; } if (value.equals(boxToCursor.get(this))) return; set(CURSOR); @@ -692,35 +709,33 @@ public final class Box extends JSScope implements Task { if (surface.cursor != tempcursor) surface.syncCursor(); } - private void setFill(Object value) throws JSExn { + private void setFill(JS value) throws JSExn { if (value == null) { if (texture == null && fillcolor == 0) return; texture = null; fillcolor = 0; - } else if (value instanceof String) { - int newfillcolor = Color.stringToColor((String)value); + } else if (JS.isString(value)) { + int newfillcolor = Color.stringToColor(JS.toString(value)); if (newfillcolor == fillcolor) return; fillcolor = newfillcolor; texture = null; - } else if (value instanceof JS) { + } else { 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()); } - DIRTY; + dirty(); } /** * Handles events which propagate down the box tree. If obscured * is set, then we merely check for Enter/Leave. */ - private void propagateDownward(Object name_, Object value, boolean obscured) { + private void propagateDownward(JS name_, JS value, boolean obscured) throws JSExn { - String name = (String)name_; + String name = JS.toString(name_); if (getSurface() == null) return; int x = globalToLocalX(getSurface()._mousex); int y = globalToLocalY(getSurface()._mousey); @@ -728,28 +743,28 @@ public final class Box extends JSScope implements Task { boolean isinside = test(VISIBLE) && inside(x, y) && !obscured; if (!wasinside && isinside) { set(MOUSEINSIDE); - putAndTriggerTrapsAndCatchExceptions("Enter", T); + putAndTriggerTrapsAndCatchExceptions(JS.S("Enter"), T); } if (isinside && test(CURSOR)) getSurface().cursor = (String)boxToCursor.get(this); if (wasinside && !isinside) { clear(MOUSEINSIDE); - putAndTriggerTrapsAndCatchExceptions("Leave", T); + putAndTriggerTrapsAndCatchExceptions(JS.S("Leave"), T); } boolean found = false; if (wasinside || isinside) for(Box child = getChild(treeSize() - 1); child != null; child = child.prevSibling()) { boolean save_stop = child.test(STOP_UPWARD_PROPAGATION); - Object value2 = value; + JS value2 = value; if (name.equals("_HScroll") || name.equals("_VScroll")) - value2 = N(((Number)value).floatValue() * ((float)child.fontSize()) / (float)fontSize()); + value2 = N(JS.toFloat(value) * ((float)child.fontSize()) / (float)fontSize()); if (obscured || !child.inside(x - child.x, y - child.y)) { - child.propagateDownward(name, value2, true); + child.propagateDownward(name_, value2, true); } else try { found = true; child.clear(STOP_UPWARD_PROPAGATION); - if (name != null) child.putAndTriggerTrapsAndCatchExceptions(name, value2); - else child.propagateDownward(name, value2, obscured); + if (name != null) child.putAndTriggerTrapsAndCatchExceptions(name_, value2); + else child.propagateDownward(name_, value2, obscured); } finally { if (save_stop) child.set(STOP_UPWARD_PROPAGATION); else child.clear(STOP_UPWARD_PROPAGATION); } @@ -761,7 +776,7 @@ public final class Box extends JSScope implements Task { if (!obscured && !found) if ("_Move".equals(name) || name.startsWith("_Release") || wasinside) if (name != null) - putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); + putAndTriggerTrapsAndCatchExceptions(JS.S(name.substring(1)), value); } /** figures out what box in this subtree of the Box owns the pixel at x,y relitave to the Surface */ @@ -821,7 +836,7 @@ public final class Box extends JSScope implements Task { void set(int mask) { flags |= mask; } void set(int mask, boolean setclear) { if (setclear) set(mask); else clear(mask); } void clear(int mask) { flags &= ~mask; } - boolean test(int mask) { return ((flags & mask) == mask); } + public boolean test(int mask) { return ((flags & mask) == mask); } // Tree Handling ////////////////////////////////////////////////////////////////////// @@ -847,15 +862,15 @@ public final class Box extends JSScope implements Task { public void removeChild(int i) { Box b = getChild(i); b.RECONSTRAIN(); - b.DIRTY; + b.dirty(); b.clear(MOUSEINSIDE); deleteNode(i); b.parent = null; REPACK(); - putAndTriggerTrapsAndCatchExceptions("ChildChange", b); + putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), b); } - public void put(int i, Object value) throws JSExn { + public void put(int i, JS value) throws JSExn { if (i < 0) return; if (value != null && !(value instanceof Box)) { @@ -864,22 +879,22 @@ public final class Box extends JSScope implements Task { } if (redirect == null) { - if (value == null) putAndTriggerTrapsAndCatchExceptions("ChildChange", getChild(i)); + if (value == null) putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), getChild(i)); else JS.warn("attempt to add/remove children to/from a node with a null redirect"); } else if (redirect != this) { - if (value != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", value); + if (value != null) putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), value); redirect.put(i, value); if (value == null) { - Box b = (Box)redirect.get(new Integer(i)); - if (b != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", b); + Box b = (Box)redirect.get(JS.N(i)); + if (b != null) putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), b); } } else if (value == null) { if (i < 0 || i > treeSize()) return; Box b = getChild(i); removeChild(i); - putAndTriggerTrapsAndCatchExceptions("ChildChange", b); + putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), b); } else { Box b = (Box)value; @@ -907,27 +922,20 @@ public final class Box extends JSScope implements Task { b.REPACK(); REPACK(); - b.DIRTY; - putAndTriggerTrapsAndCatchExceptions("ChildChange", b); + b.dirty(); + putAndTriggerTrapsAndCatchExceptions(JS.S("ChildChange"), b); } } - public void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { + public void putAndTriggerTrapsAndCatchExceptions(JS name, JS val) { try { putAndTriggerTraps(name, val); } catch (JSExn e) { - JS.log("caught js exception while putting to trap \""+name+"\""); + JS.log("caught js exception while putting to trap \""+ JS.debugToString(name)+"\""); JS.log(e); } catch (Exception e) { - JS.log("caught exception while putting to trap \""+name+"\""); + JS.log("caught exception while putting to trap \""+ JS.debugToString(name)+"\""); JS.log(e); } } - } - - - - - -