X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=a1879810cd71abc9d90b9adf2cacb47983a345a6;hb=67eeff476179a91ae930ea89cbecde22132ca532;hp=89906b51c2e94854fece229a8bd0fa6658bd4fd6;hpb=9d07963a45f2147a62d8897e9c4245c224d98ccb;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 89906b5..a187981 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -17,7 +17,6 @@ import java.util.*;
  *  Scheduler-time (the size/position/state at the time that the
  *  now-executing message was enqueued). This distinction is important.
  */
-// FIXME: put the scar box back in
 public abstract class Surface extends PixelBuffer {
 
     public int getWidth() { return root == null ? 0 : root.width; }
@@ -25,7 +24,6 @@ public abstract class Surface extends PixelBuffer {
         
     // Static Data ////////////////////////////////////////////////////////////////////////////////
 
-    // FIXME
     private abstract static class Message extends Scheduler.Task {
         public abstract void perform();
         public Object call(Object arg) { perform(); return null; }
@@ -111,7 +109,7 @@ public abstract class Surface extends PixelBuffer {
             final Box who = Box.whoIs(root, mousex, mousey);
             Scheduler.add(new Message() { public void perform() {
                 Platform.clipboardReadEnabled = true;
-                root.put("Press3", Boolean.TRUE);
+                root.putAndTriggerJSTraps("Press3", Boolean.TRUE);
                 Platform.clipboardReadEnabled = false;
             }});
         }
@@ -172,18 +170,18 @@ public abstract class Surface extends PixelBuffer {
         public KMessage(String k) { key = k; }
         public void perform() {
             if (key.equals("C-v") || key.equals("A-v")) Platform.clipboardReadEnabled = true;
-            /* FIXME
             outer: for(int i=0; i<keywatchers.size(); i++) {
                 Box b = (Box)keywatchers.elementAt(i);
-                for(Box cur = b; cur != null; cur = cur.getParent())
-                    if ((cur.flags & cur.INVISIBLE_FLAG) != 0) continue outer;
-                b.put("KeyPressed", key);
+                for(Box cur = b; cur != null; cur = cur.parent)
+                    if (!cur.test(cur.VISIBLE)) continue outer;
+                b.putAndTriggerJSTraps("KeyPressed", key);
             }
-            */
             Platform.clipboardReadEnabled = false;
         }
     }
 
+    Vec keywatchers = new Vec();
+
     /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
     protected final void KeyReleased(final String key) {
         if (key == null) return;
@@ -191,14 +189,12 @@ public abstract class Surface extends PixelBuffer {
         else if (key.toLowerCase().equals("control")) control = false;
         else if (key.toLowerCase().equals("shift")) shift = false;
         Scheduler.add(new Message() { public void perform() {
-            /* FIXME
             outer: for(int i=0; i<keywatchers.size(); i++) {
                 Box b = (Box)keywatchers.elementAt(i);
-                for(Box cur = b; cur != null; cur = cur.getParent())
-                    if ((cur.flags & cur.INVISIBLE_FLAG) != 0) continue outer;
-                b.put("KeyReleased", key);
+                for(Box cur = b; cur != null; cur = cur.parent)
+                    if (!cur.test(cur.VISIBLE)) continue outer;
+                b.putAndTriggerJSTraps("KeyReleased", key);
             }
-            */
         }});
     }
 
@@ -225,7 +221,7 @@ public abstract class Surface extends PixelBuffer {
 
                 // Root gets motion events outside itself (if trapped, of course)
                 if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
-                    root.put("Move", Boolean.TRUE);
+                    root.putAndTriggerJSTraps("Move", Boolean.TRUE);
 
                 root.Move(oldmousex, oldmousey, mousex, mousey);
                 if (!cursor.equals(oldcursor)) syncCursor();
@@ -236,7 +232,7 @@ public abstract class Surface extends PixelBuffer {
     protected final void SizeChange(final int width, final int height) {
         Scheduler.add(new Message() { public void perform() {
             if (width == root.width && height == root.height) return;
-            root.needs_reflow = true;
+            root.set(REFLOW);
             do { abort = false; root.reflow(width, height); } while(abort);
         }});
         abort = true;
@@ -246,7 +242,7 @@ public abstract class Surface extends PixelBuffer {
         Scheduler.add(new Message() { public void perform() {
             root.x = x;
             root.y = y;
-            root.put("PosChange", Boolean.TRUE);
+            root.putAndTriggerJSTraps("PosChange", Boolean.TRUE);
         }});
     }
 
@@ -286,15 +282,23 @@ public abstract class Surface extends PixelBuffer {
         Refresh();
     }
 
+    public static Surface fromBox(Box b) {
+        for(int i=0; i<allSurfaces.size(); i++) {
+            Surface s = (Surface)allSurfaces.elementAt(i);
+            if (s.root == b) return s;
+        }
+        return null;
+    }
+
     public Surface(Box root) {
 
         this.root = root;
-        if (root.surface != null && root.surface.root == root) root.surface.dispose(false);
+        Surface old = fromBox(root);
+        if (old != null) old.dispose(false);
         else root.remove();
-        root.surface = this;
 
         // make sure the root is properly sized
-        do { abort = false; root.reflow(); } while(abort);
+        do { abort = false; root.reflow(root.width, root.height); } while(abort);
 
         root.dirty();
         Refresh();
@@ -308,7 +312,7 @@ public abstract class Surface extends PixelBuffer {
         // make sure the root is properly sized
         do {
             abort = false;
-            root.reflow();
+            root.reflow(root.width, root.height);
             setSize(root.width, root.height);
             // update mouseinside and trigger Enter/Leave as a result of box size/position changes
             String oldcursor = cursor;
@@ -317,7 +321,7 @@ public abstract class Surface extends PixelBuffer {
             if (!cursor.equals(oldcursor)) syncCursor();
         } while(abort);
 
-        Box.sizePosChangesSinceLastRender = 0;
+        //Box.sizePosChangesSinceLastRender = 0;
         int[][] dirt = dirtyRegions.flush();
         for(int i = 0; dirt != null && i < dirt.length; i++) {
             if (dirt[i] == null) continue;
@@ -364,7 +368,7 @@ public abstract class Surface extends PixelBuffer {
             Scheduler.add(this);
         }
         
-        public void perform() { boxContainingMouse.put(name, value); }
+        public void perform() { boxContainingMouse.putAndTriggerJSTraps(name, value); }
         public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
 
     }
@@ -388,9 +392,9 @@ public abstract class Surface extends PixelBuffer {
             backbuffer.drawPictureAlphaOnly(source, dx, dy, cx1, cy1, cx2, cy2, argb);
         }
 
-        public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color) {
+        public void fillJSTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color) {
             screenDirtyRegions.dirty(Math.min(x1, x3), y1, Math.max(x2, x4) - Math.min(x1, x3), y2 - y1);
-            backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color); }
+            backbuffer.fillJSTrapezoid(x1, x2, y1, x3, x4, y2, color); }
 
         public void render() {
             super.render();