X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=8287e45ef18cd4d77d71a830f263c535c177395d;hb=66088da8711e9855d6328732bbcce8788301a8bc;hp=3da445a86b5ffecfddef6c40a5edac73739a1d69;hpb=bc6ac951869686b84803f45f549ccb888a9f776c;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 3da445a..8287e45 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -39,7 +39,7 @@ import org.xwt.translators.*; * SizeChanges trigger an 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 { +public final class Box extends JSScope implements Scheduler.Task { // Macros ////////////////////////////////////////////////////////////////////// @@ -57,10 +57,45 @@ public final class Box extends JSScope { //#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; } + protected Box() { super(null); } static Hash boxToCursor = new Hash(500, 3); public static final int MAX_LENGTH = Integer.MAX_VALUE; + static final Font DEFAULT_FONT; + + static { + Font f = null; + try { f = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } + catch(JSExn e) { Log.log(Box.class, "should never happen: "+e); } + DEFAULT_FONT = f; + } + + // box properties can not be trapped + static final String[] props = new String[] { + "fill", "stroke", "image", "tile", "fixedaspect", "text", "path", "font", + "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows", + "colspan", "rowspan", "align", "visible", "absolute", "globalx", "globaly", + "minwidth", "maxwidth", "minheight", "maxheight", + "numchildren", "redirect", "cursor", "mousex", "mousey", "xwt", "static", + "mouseinside", "root", "thisbox", "indexof" + }; + + // 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", + "KeyPressed", "KeyReleased", "PosChange", "SizeChange", + + "childadded", "childremoved", + + "Focused", "Maximized", "Minimized", "Close", + "icon", "titlebar", "toback", "tofront" + }; // Flags ////////////////////////////////////////////////////////////////////// @@ -96,8 +131,8 @@ public final class Box extends JSScope { int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */; private String text = null; - private Font font = null; - private Picture.Holder texture; + private Font font = DEFAULT_FONT; + private Picture texture; private short strokewidth = 1; private int fillcolor = 0x00000000; private int strokecolor = 0xFF000000; @@ -131,6 +166,15 @@ public final class Box extends JSScope { // Instance Methods ///////////////////////////////////////////////////////////////////// + + /** invoked when a resource needed to render ourselves finishes loading */ + public void perform() { + MARK_REPACK; + MARK_REFLOW; + MARK_RESIZE; + dirty(); + } + public Box getRoot() { return parent == null ? this : parent.getRoot(); } public Surface getSurface() { return Surface.fromBox(getRoot()); } @@ -185,17 +229,6 @@ public final class Box extends JSScope { 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(); } - /** only for use on the root box */ - void reflow(int new_width, int new_height) { - repack(); - /* - new_width = bound(max(contentwidth, minwidth), new_width, test(HSHRINK) ? max(contentwidth, minwidth) : maxwidth); - new_height = bound(max(contentheight, minheight), new_height, test(VSHRINK) ? max(contentheight, minheight) : maxheight); - */ - resize(x, y, new_width, new_height); - resize_children(); - } - /** pack the boxes into rows and columns; also computes contentwidth */ void repack() { for(Box child = getChild(0); child != null; child = child.nextSibling()) child.repack(); @@ -229,22 +262,23 @@ public final class Box extends JSScope { //#end } - private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { + void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { // FEATURE reimplement, but we're destroying this - if (x != this.x || y != this.y || width != this.width || height != this.height) { + // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345 + //if (x != this.x || y != this.y || width != this.width || height != this.height) { (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height); boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null; boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; this.width = width; this.height = height; this.x = x; this.y = y; dirty(); - try { if (sizechange) putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ } - catch (Exception e) { Log.log(this, e); } - try { if (poschange) putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ } - catch (Exception e) { Log.log(this, e); } - } + if (sizechange) try { putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ } + catch (Exception e) { Log.log(this, e); } + if (poschange) try { putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ } + catch (Exception e) { Log.log(this, e); } + //} } - private void resize_children() { + void resize_children() { //#repeat col/row colspan/rowspan contentwidth/contentheight x/y width/height colMaxWidth/rowMaxHeight colWidth/rowHeight \ // HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight x_slack/y_slack @@ -329,15 +363,14 @@ public final class Box extends JSScope { if ((fillcolor & 0xFF000000) != 0x00000000) buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor); - if (texture != null && texture.picture != null) - for(int x = globalx; x < cx2; x += texture.picture.getWidth()) - for(int y = globaly; y < cy2; y += texture.picture.getHeight()) - buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2); + if (texture != null && texture.isLoaded) + for(int x = globalx; x < cx2; x += texture.width) + for(int y = globaly; y < cy2; y += texture.height) + buf.drawPicture(texture, x, y, cx1, cy1, cx2, cy2); - if (text != null && !text.equals("") && font != null) + if (text != null && !text.equals("") && font != null) if (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1) - font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, - new Scheduler.Task() { public void perform() { Box b = Box.this; MARK_REFLOW_b; dirty(); }}); + font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this); for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null); @@ -363,7 +396,18 @@ public final class Box extends JSScope { public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } - protected boolean isTrappable() { return true; } + 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); @@ -412,6 +456,9 @@ public final class Box extends JSScope { throw new Error("unreachable"); // unreachable } + void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); } + void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); } + public void put(Object name, Object value) throws JSExn { if (name instanceof Number) { put(toInt(name), value); return; } //#switch(name) @@ -423,11 +470,11 @@ public final class Box extends JSScope { case "shrink": put("hshrink", value); put("vshrink", value); case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE; case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE; - case "width": if (parent==null&&Surface.fromBox(this)!=null) { CHECKSET_INT(width); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; } - case "height": if (parent == null&&Surface.fromBox(this)!=null) { CHECKSET_INT(height); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; } - case "maxwidth": CHECKSET_INT(maxwidth); MARK_RESIZE; + case "width": put("maxwidth", value); put("minwidth", value); MARK_RESIZE; + case "height": put("maxheight", value); put("minheight", value); MARK_RESIZE; + case "maxwidth": setMaxWidth(value); case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE; - case "maxheight": CHECKSET_INT(maxheight); MARK_RESIZE; + case "maxheight": setMaxHeight(value); case "minheight": CHECKSET_INT(minheight); MARK_RESIZE; case "colspan": CHECKSET_SHORT(colspan); MARK_REPACK_parent; case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent; @@ -461,20 +508,15 @@ public final class Box extends JSScope { case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once"); case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty(); case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty(); - case "x": if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); - case "y": if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); + case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); } + case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); } case "KeyPressed": return; // prevent stuff from hitting the Hash case "KeyReleased": return; // prevent stuff from hitting the Hash case "PosChange": return; // prevent stuff from hitting the Hash case "SizeChange": return; // prevent stuff from hitting the Hash case "childadded": return; // prevent stuff from hitting the Hash case "childremoved": return; // prevent stuff from hitting the Hash - case "thisbox": { - if (value != null) break; - if (parent != null) { parent.removeChild(parent.indexNode(this)); return; } - Surface surface = Surface.fromBox(this); - if (surface != null) surface.dispose(true); - } + case "thisbox": if (value == null) removeSelf(); default: super.put(name, value); //#end } @@ -531,17 +573,21 @@ public final class Box extends JSScope { return; } if (!(value instanceof Res)) return; - texture = Picture.fromRes((Res)value, null); - if (texture != null) { - minwidth = texture.picture.getWidth(); - minheight = texture.picture.getHeight(); + + + // FIXME + texture = Picture.load((Res)value, this); + if (texture.isLoaded) { + minwidth = texture.width; + minheight = texture.height; MARK_REFLOW; dirty(); return; } - texture = Picture.fromRes((Res)value, new Scheduler.Task() { public void perform() { - minwidth = texture.picture.getWidth(); - minheight = texture.picture.getHeight(); + texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() { + // FIXME pass this instead of a new Task? + minwidth = texture.width; + minheight = texture.height; Box b = Box.this; MARK_REFLOW_b; dirty(); } }); @@ -646,6 +692,12 @@ public final class Box extends JSScope { // Tree Manipulation ///////////////////////////////////////////////////////////////////// + void removeSelf() { + if (parent != null) { parent.removeChild(parent.indexNode(this)); return; } + Surface surface = Surface.fromBox(this); + if (surface != null) surface.dispose(true); + } + /** remove the i^th child */ public void removeChild(int i) { Box b = getChild(i);