2003/12/27 01:03:53

[org.ibex.core.git] / src / org / xwt / Box.java

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 3e2599b..b251d3b 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -121,7 +121,7 @@ public final class Box extends JSScope implements Scheduler.Task {
     static final int ALIGN_RIGHT  = 0x00008000;
     static final int ALIGNS       = 0x0000f000;
     static final int CURSOR       = 0x00010000;  // if true, this box has a cursor in the cursor hash; FEATURE: GC issues?
-    static final int NOCLIP       = 0x00020000;
+    static final int CLIP         = 0x00020000;
     static final int STOP_UPWARD_PROPAGATION    = 0x00040000;
 
 
@@ -129,13 +129,13 @@ public final class Box extends JSScope implements Scheduler.Task {
 
     Box parent = null;
     Box redirect = this;
-    int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION;
+    int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION | CLIP;
 
     private String text = null;
     private Font font = DEFAULT_FONT; 
     private Picture texture = null;
     private short strokewidth = 1;
-    private int fillcolor = 0x00000000;
+    public int fillcolor = 0x00000000;
     private int strokecolor = 0xFF000000;
 
     private int aspect = 0;
@@ -194,7 +194,8 @@ public final class Box extends JSScope implements Scheduler.Task {
     public void dirty() { dirty(0, 0, width, height); }
     public void dirty(int x, int y, int w, int h) {
         for(Box cur = this; cur != null; cur = cur.parent) {
-            if (!cur.test(NOCLIP)) {
+            // x and y have a different meaning on the root box
+            if (cur.parent != null && cur.test(CLIP)) {
                 w = min(x + w, cur.width) - max(x, 0);
                 h = min(y + h, cur.height) - max(y, 0);
                 x = max(x, 0);
@@ -255,23 +256,23 @@ public final class Box extends JSScope implements Scheduler.Task {
     }
     
     void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
-        // FEATURE reimplement, but we're destroying this
-        // 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) {
             boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
             boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
             do {
+                int thisx = parent == null ? 0 : this.x;
+                int thisy = parent == null ? 0 : this.y;
                 if (texture == null && (text == null || text.equals(""))) {
                     if ((fillcolor & 0xff000000) == 0) break;
                     // FEATURE: more optimizations here
                     if (this.x == x && this.y == y) {
                         Box who = (parent == null ? this : parent);
-                        who.dirty(min(this.x+this.width,x+width), y, Math.abs(width-this.width), max(this.height, height));
-                        who.dirty(x, min(this.y+this.height,y+height), max(this.width, width), Math.abs(height-this.height));
+                        who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height));
+                        who.dirty(thisx, thisy+min(this.height,height), min(this.width, width), Math.abs(height-this.height));
                         break;
                     }
                 }
-                (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
+                (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
                 this.width = width; this.height = height; this.x = x; this.y = y;
                 dirty();
             } while (false);
@@ -356,7 +357,7 @@ public final class Box extends JSScope implements Scheduler.Task {
 
         // intersect the x,y,w,h rendering window with ourselves; quit if it's empty
 
-        if (!test(NOCLIP)) {
+        if (test(CLIP)) {
             cx1 = max(cx1, parent == null ? 0 : globalx);
             cy1 = max(cy1, parent == null ? 0 : globaly);
             cx2 = min(cx2, globalx + width);
@@ -441,7 +442,7 @@ 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 "noclip": return B(test(NOCLIP));
+        case "clip": return B(test(CLIP));
         case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T)));
         case "packed": return B(test(PACKED));
         case "globalx": return N(localToGlobalX(0));
@@ -477,8 +478,14 @@ public final class Box extends JSScope implements Scheduler.Task {
         }
     }
 
-    void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); }
-    void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); }
+    void setMaxWidth(Object value) {
+        do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false);
+        if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth;
+    }
+    void setMaxHeight(Object value) {
+        do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false);
+        if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight;
+    }
 
     public void put(Object name, Object value) throws JSExn {
         if (name instanceof Number) { put(toInt(name), value); return; }
@@ -501,7 +508,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent;
         case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK;
         case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK;
-        case "noclip": CHECKSET_FLAG(NOCLIP); if (parent == null) dirty(); else parent.dirty();
+        case "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty();
         case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty();
         case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent;
         case "aspect": CHECKSET_INT(aspect); dirty();
@@ -627,6 +634,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         texture = Picture.load((Res)value, this);
     }
 
+    // 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.