From: megacz Date: Fri, 30 Jan 2004 07:35:45 +0000 (+0000) Subject: 2003/09/18 08:04:08 X-Git-Tag: RC3~607 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=fdb9f1c6460e6833e58d1f8b4d45fd21306b88c0 2003/09/18 08:04:08 darcs-hash:20040130073545-2ba56-35225c846ec4889651f7de57ee53da5e2c3389f2.gz --- diff --git a/Makefile b/Makefile index ed4c7ab..c011be4 100644 --- a/Makefile +++ b/Makefile @@ -114,11 +114,11 @@ jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o) -$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o +$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o + upstream/install/bin/$(target)-ar rcs $(platform).ar $^ + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o ############################################################################## diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index 2c60161..f48835d 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -6,11 +6,10 @@ package org.xwt; // RULE: coordinates on non-static methods are ALWAYS relative to the // upper-left hand corner of this +// FIXME: font color, italicization, bolding, and underlining // FIXME: align -// FIXME: use bitfields -// FIXME: fixedaspect -// FIXME: reflow before allowing js to read from width/height -// FIXME: due to font inheritance, we must dirty and mark all null-font descendents of a node if its font changes +// FIXME: fixed aspect +// FEATURE: reflow before allowing js to read from width/height // FEATURE: fastpath for rows=1/cols=1 // FEATURE: reflow starting with a certain child // FEATURE: separate mark_for_reflow and mark_for_resize @@ -56,10 +55,11 @@ import org.xwt.imp.*; * SizeChanges trigger an Surface.abort; if rendering were done in the same * pass, rendering work done prior to the Surface.abort would be wasted. * - * Repacking is seperate from resizing since a box's size depends on - * both the box's parent's size (so the traversal must be preorder) - * contentwidths of siblings both before and after the box, which in - * turn depend on all descendents of the siblings. FIXME + * The two passes are repack and resize. Together they are known as + * reflow. Repacking assigns boxes to the appropriate grid + * coordinates within the parents and computes + * contentwidth/contentheight. Resize computes actual size and + * position. * * A note on coordinates: the Box class represents regions * internally as x,y,w,h tuples, even though the DoubleBuffer class @@ -82,12 +82,35 @@ public final class Box extends JS.Scope { //#define MARK_FOR_REFLOW_b for(Box b2 = b; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true; //#define MARK_FOR_REFLOW_b_parent for(Box b2 = b.parent; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true; - private boolean mouseinside = false; Box redirect = this; Surface surface = null; // null on all non-root boxen + + // FEATURE: combine this with the JSObject Hash Hash traps = null; + // Flags /////////////////////////////////////////////////////////////////////////////// + static int MOUSEINSIDE_FLAG = 0x00000001; + static int INVISIBLE_FLAG = 0x00000002; + static int ABSOLUTE_FLAG = 0x00000004; + static int HSHRINK_FLAG = 0x00000010; + static int VSHRINK_FLAG = 0x00000020; + static int TILE_FLAG = 0x00000040; + + /** + * Set when the font changes, cleared during repack. If set + * during repack, all font==null children are marked for reflow + * and given the font_changed_flag. We use this flag to avoid + * having to iterate over all descendents of a box when its font + * changes. + */ + static int FONT_CHANGED_FLAG = 0x00000100; + + static int ALIGN_FLAG = 0x00000000; + static int FIXEDASPECT_FLAG = 0x00000000; + int flags = 0; + + // Geometry //////////////////////////////////////////////////////////////////////////// // xwt can be compiled with 16-bit lengths to save memory on small devices @@ -107,7 +130,7 @@ public final class Box extends JS.Scope { private LENGTH textwidth = 0; private LENGTH textheight = 0; - // FIXME: use shorts + // FEATURE: use shorts private int rows = 1; private int cols = 0; private int rowspan = 1; @@ -118,8 +141,8 @@ public final class Box extends JS.Scope { LENGTH y = 0; public LENGTH width = 0; public LENGTH height = 0; - private int row = 0; // FIXME use a short - private int col = 0; // FIXME use a short + private int row = 0; // FEATURE use a short + private int col = 0; // FEATURE use a short private LENGTH contentwidth = 0; // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad) private LENGTH contentheight = 0; @@ -136,17 +159,9 @@ public final class Box extends JS.Scope { private String cursor = null; // the cursor for this box - //FIXME make private - public boolean invisible = false; // true iff the Box is invisible - private boolean absolute = false; // If true, the box will be positioned absolutely - private boolean vshrink = false; // If true, the box will shrink to the smallest vertical size possible - private boolean hshrink = false; // If true, the box will shrink to the smallest horizontal size possible - private boolean tile = false; // FIXME: drop this? - // Instance Methods ///////////////////////////////////////////////////////////////////// - // FIXME: rethink /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ public final void dirty() { dirty(0, 0, width, height); } public final void dirty(int x, int y, int w, int h) { @@ -172,9 +187,9 @@ public final class Box extends JS.Scope { void Move(int oldmousex, int oldmousey, int mousex, int mousey) { Move(oldmousex, oldmousey, mousex, mousey, false); } void Move(int oldmousex, int oldmousey, int mousex, int mousey, boolean forceleave) { - boolean wasinside = mouseinside; - boolean isinside = !invisible && inside(mousex, mousey) && !forceleave; - mouseinside = isinside; + boolean wasinside = (flags & MOUSEINSIDE_FLAG) != 0; + boolean isinside = !((flags & INVISIBLE_FLAG) != 0) && inside(mousex, mousey) && !forceleave; + if (isinside) flags |= MOUSEINSIDE_FLAG; else flags &= ~MOUSEINSIDE_FLAG; if (!wasinside && !isinside) return; @@ -215,9 +230,14 @@ public final class Box extends JS.Scope { // --- Phase 0 ---------------------------------------------------------------------- // recurse for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (((flags & FONT_CHANGED_FLAG) != 0) && child.font == null) { + child.flags |= FONT_CHANGED_FLAG; + child.needs_reflow = true; + } child.repack(); if (Surface.abort) { MARK_FOR_REFLOW_this; return; } } + flags &= ~FONT_CHANGED_FLAG; // --- Phase 1 ---------------------------------------------------------------------- // assign children to their row/column positions (assuming constrained columns) @@ -226,7 +246,7 @@ public final class Box extends JS.Scope { if (rows == 0) { int[] numRowsInCol = new int[cols]; // the number of cells occupied in each column Box child = getChild(0); - for(; child != null && (child.absolute || child.invisible); child = child.nextSibling()); + for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling()); OUTER: for(int row=0; child != null; row++) { for(int col=0; child != null && col < cols;) { INNER: while(true) { // scan across the row, looking for an unoccupied gap at least as wide as the child @@ -241,7 +261,7 @@ public final class Box extends JS.Scope { child.row = row; col += min(cols, child.colspan); child = child.nextSibling(); - for(; child != null && (child.absolute || child.invisible); child = child.nextSibling()); + for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling()); } } } @@ -257,7 +277,7 @@ public final class Box extends JS.Scope { numCols = max(numCols, child.col + child.colspan); LENGTH[] colWidth = new LENGTH[numCols]; for(Box child = getChild(0); child != null; child = child.nextSibling()) - if (!(child.absolute || child.invisible)) + if (!(((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0))) colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan); for(int col=0; col=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; } static final int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; } - final boolean inside(int x, int y) { return (!invisible && x >= 0 && y >= 0 && x < width && y < height); } + final boolean inside(int x, int y) { return (!((flags & INVISIBLE_FLAG) != 0) && x >= 0 && y >= 0 && x < width && y < height); } /** figures out what box in this subtree of the Box owns the pixel at x,y relitave to the Surface */ public static Box whoIs(Box cur, int x, int y) { @@ -873,7 +887,7 @@ public final class Box extends JS.Scope { // is UNSYNCHRONIZED for performance reasons. BE CAREFUL // HERE. - if (cur.invisible) return null; + if ((cur.flags & INVISIBLE_FLAG) != 0) return null; if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null; OUTER: while(true) { for(int i=cur.numChildren() - 1; i>=0; i--) { @@ -881,7 +895,7 @@ public final class Box extends JS.Scope { if (child == null) continue; // since this method is unsynchronized, we have to double-check globalx += child.x; globaly += child.y; - if (!child.invisible && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } + if (!((child.flags & INVISIBLE_FLAG) != 0) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; } globalx -= child.x; globaly -= child.y; } @@ -990,8 +1004,9 @@ public final class Box extends JS.Scope { public Object get(Box b) { return b.font; } public void put(Box b, Object value) { b.font = value == null ? null : value.toString(); - // FIXME: need a resource stream to hand off to MIPS - // FIXME: MARK_FOR_REFLOW here + // FIXME: translate value into a resource + MARK_FOR_REFLOW_b; + b.flags |= FONT_CHANGED_FLAG; b.dirty(); } }); @@ -1043,17 +1058,17 @@ public final class Box extends JS.Scope { }); specialBoxProperties.put("shrink", new SpecialBoxProperty() { - public Object get(Box b) { return (b.vshrink && b.hshrink) ? Boolean.TRUE : Boolean.FALSE; } + public Object get(Box b) { return (((b.flags & HSHRINK_FLAG) != 0) || ((b.flags & VSHRINK_FLAG) != 0)) ? Boolean.TRUE : Boolean.FALSE; } public void put(Box b, Object value) { b.put("hshrink", value); b.put("vshrink", value); } }); - //#repeat hshrink/vshrink + //#repeat hshrink/vshrink HSHRINK_FLAG/VSHRINK_FLAG specialBoxProperties.put("hshrink", new SpecialBoxProperty() { - public Object get(Box b) { return new Boolean(b.hshrink); } + public Object get(Box b) { return new Boolean((b.flags & HSHRINK_FLAG) != 0); } public void put(Box b, Object value) { boolean newshrink = stob(value); - if (b.hshrink == newshrink) return; - b.hshrink = newshrink; + if (((b.flags & HSHRINK_FLAG) != 0) == newshrink) return; + if (newshrink) b.flags |= HSHRINK_FLAG; else b.flags &= ~HSHRINK_FLAG; MARK_FOR_REFLOW_b; } }); @@ -1063,11 +1078,11 @@ public final class Box extends JS.Scope { specialBoxProperties.put("x", new SpecialBoxProperty() { public Object get(Box b) { if (b.surface == null) return new Integer(0); - if (b.invisible) return new Integer(0); + if ((b.flags & INVISIBLE_FLAG) != 0) return new Integer(0); return new Integer(b.x); } public void put(Box b, Object value) { - if (!b.absolute) return; + if (!((b.flags & ABSOLUTE_FLAG) != 0)) return; int x = stoi(value); if (x == b.x) return; b.dirty(); @@ -1122,23 +1137,24 @@ public final class Box extends JS.Scope { //#end specialBoxProperties.put("tile", new SpecialBoxProperty() { - public Object get(Box b) { return b.tile ? Boolean.TRUE : Boolean.FALSE; } + public Object get(Box b) { return ((b.flags & TILE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } public void put(Box b, Object value) { - if (b.tile == stob(value)) return; - b.tile = stob(value); + if (((b.flags & TILE_FLAG) != 0) == stob(value)) return; + if (stob(value)) b.flags |= TILE_FLAG; else b.flags &= ~TILE_FLAG; b.dirty(); } }); specialBoxProperties.put("invisible", new SpecialBoxProperty() { public Object get(Box b) { - for (Box cur = b; cur != null; cur = cur.parent) { if (cur.invisible) return Boolean.TRUE; } + for (Box cur = b; cur != null; cur = cur.parent) { + if ((cur.flags & INVISIBLE_FLAG) != 0) return Boolean.TRUE; } return Boolean.FALSE; } public void put(Box b, Object value) { - if (stob(value) == b.invisible) return; - b.invisible = stob(value); + if (stob(value) == ((b.flags & INVISIBLE_FLAG) != 0)) return; + if (stob(value)) b.flags |= INVISIBLE_FLAG; else b.flags &= ~INVISIBLE_FLAG; if (b.parent == null) { - if (b.surface != null) b.surface.setInvisible(b.invisible); + if (b.surface != null) b.surface.setInvisible((b.flags & INVISIBLE_FLAG) != 0); } else { b.dirty(); MARK_FOR_REFLOW_b_parent; @@ -1147,11 +1163,11 @@ public final class Box extends JS.Scope { }}); specialBoxProperties.put("absolute", new SpecialBoxProperty() { - public Object get(Box b) { return b.absolute ? Boolean.TRUE : Boolean.FALSE; } + public Object get(Box b) { return ((b.flags & ABSOLUTE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } public void put(Box b, Object value) { - if (stob(value) == b.absolute) return; - b.absolute = stob(value); - if (b.absolute) { b.x = 0; b.y = 0; } + if (stob(value) == ((b.flags & ABSOLUTE_FLAG) != 0)) return; + if (stob(value)) b.flags |= ABSOLUTE_FLAG; else b.flags &= ~ABSOLUTE_FLAG; + if ((b.flags & ABSOLUTE_FLAG) != 0) { b.x = 0; b.y = 0; } if (b.parent != null) MARK_FOR_REFLOW_b_parent; } }); @@ -1217,7 +1233,8 @@ public final class Box extends JS.Scope { }); specialBoxProperties.put("mouseinside", new SpecialBoxProperty() { - public Object get(Box b) { return b.mouseinside ? Boolean.TRUE : Boolean.FALSE; } + public Object get(Box b) { + return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } }); specialBoxProperties.put("numchildren", new SpecialBoxProperty() { @@ -1321,8 +1338,8 @@ public final class Box extends JS.Scope { }); // these are all do-nothings; just to prevent space from getting taken up in the params Hash. - specialBoxProperties.put("KeyPressed", new SpecialBoxProperty()); // FIXME should cascade - specialBoxProperties.put("KeyReleased", new SpecialBoxProperty()); // FIXME should cascade + specialBoxProperties.put("KeyPressed", new SpecialBoxProperty()); + specialBoxProperties.put("KeyReleased", new SpecialBoxProperty()); specialBoxProperties.put("PosChange", new SpecialBoxProperty()); specialBoxProperties.put("SizeChange", new SpecialBoxProperty()); @@ -1372,23 +1389,25 @@ public final class Box extends JS.Scope { } }); - /* - // FIXME: need to be able to read this back + // FEATURE: this still isn't totally harmonious; when you createSurface, these aren't checked specialBoxProperties.put("titlebar", new SpecialBoxProperty() { - public void put(Box b, Object value) { surface.setTitleBarText(value.toString()); } - public Object get(Box b) { return b.ti; } + public void put(Box b, Object value) { + if (b.surface != null) b.surface.setTitleBarText(value.toString()); + b.put_("titlebar", value); + } + public Object get(Box b) { return b.get_("titlebar"); } }); - // FIXME: need to be able to read this back specialBoxProperties.put("icon", new SpecialBoxProperty() { public void put(Box b, Object value) { - Picture pic = Box.getPicture(value.toString()); - if (pic != null) surface.setIcon(pic); + b.put_("icon", value); + if (b.surface == null) return; + Picture pic = ImageDecoder.getPicture(value.toString()); + if (pic != null) b.surface.setIcon(pic); else if (Log.on) Log.log(this, "unable to load icon " + value); } - public Object get(Box b) { return b.id; } + public Object get(Box b) { return b.get_("icon"); } }); - */ } } diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java index e5768f0..93d92f7 100644 --- a/src/org/xwt/Platform.java +++ b/src/org/xwt/Platform.java @@ -380,9 +380,9 @@ public class Platform { /** this method invokes the platform _createSurface() method and then enforces a few post-call invariants */ public static Surface createSurface(Box b, boolean framed, boolean refreshable) { Surface ret = platform._createSurface(b, framed); - ret.setInvisible(b.invisible); b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width; b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height; + ret.setInvisible(false); Object titlebar = b.get("titlebar", true); if (titlebar != null) ret.setTitleBarText(titlebar.toString()); diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java index 1e9e222..0f47dfb 100644 --- a/src/org/xwt/Surface.java +++ b/src/org/xwt/Surface.java @@ -216,7 +216,7 @@ public abstract class Surface { outer: for(int i=0; i