X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=3a083ccbd1540d02250d8d586f7fb73fbae7d920;hb=0b0673bbc7f06c5d5418d5ab7ad5961a464e2de0;hp=9f48b2c123d23bb0f9f522c31674e75d2aa47b4a;hpb=6a96430e10e27fc1de5754cb5add705f929dd109;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 9f48b2c..3a083cc 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,14 +24,8 @@ 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; }
-    }
-
     /**< the most recently enqueued Move message; used to throttle the message rate */
-    private static Message lastMoveMessage = null;
+    private static Scheduler.Task lastMoveMessage = null;
 
     /** all instances of Surface which need to be refreshed by the Scheduler */
     public static Vec allSurfaces = new Vec();
@@ -86,13 +79,17 @@ public abstract class Surface extends PixelBuffer {
     public void setLimits(int min_width, int min_height, int max_width, int max_height) { }
     protected abstract void _setSize(int width, int height);  ///< Sets the surface's width and height.
 
+
+    private int platform_window_width = 0;
+    private int platform_window_height = 0;
     protected final void setSize(int width, int height) {
         if (root.width != width || root.height != height) {
             root.dirty(0, root.height - Main.scarImage.getHeight(), Main.scarImage.getWidth(), Main.scarImage.getHeight());
             root.width = Math.max(Main.scarImage.getWidth(), width);
             root.height = Math.max(Main.scarImage.getHeight(), height);
         }
-        _setSize(root.width, root.height);
+        if (root.width > 0 && root.height > 0 && platform_window_width != root.width && platform_window_height != root.height)
+            _setSize(root.width, root.height);
     }
 
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
@@ -109,9 +106,9 @@ public abstract class Surface extends PixelBuffer {
         else if (button == 2) new SimpleMessage("Press2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
         else if (button == 3) {
             final Box who = Box.whoIs(root, mousex, mousey);
-            Scheduler.add(new Message() { public void perform() {
+            Scheduler.add(new Scheduler.Task() { public void perform() {
                 Platform.clipboardReadEnabled = true;
-                root.put("Press3", Boolean.TRUE);
+                root.putAndTriggerJSTraps("Press3", Boolean.TRUE);
                 Platform.clipboardReadEnabled = false;
             }});
         }
@@ -149,7 +146,9 @@ public abstract class Surface extends PixelBuffer {
         else if (button == 3) new SimpleMessage("DoubleClick3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
     }
 
-    /** sends a KeyPressed message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+    /** Sends a KeyPressed message; subclasses should not add the C- or A- prefixes,
+     *  nor should they capitalize alphabet characters
+     */
     protected final void KeyPressed(String key) {
         if (key == null) return;
 
@@ -167,38 +166,37 @@ public abstract class Surface extends PixelBuffer {
     }
 
     // This is implemented as a private static class instead of an anonymous class to work around a GCJ bug
-    private class KMessage extends Message {
+    private class KMessage extends Scheduler.Task {
         String key = null;
         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;
         }
     }
 
-    /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+    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;
         if (key.toLowerCase().equals("alt")) alt = false;
         else if (key.toLowerCase().equals("control")) control = false;
         else if (key.toLowerCase().equals("shift")) shift = false;
-        Scheduler.add(new Message() { public void perform() {
-            /* FIXME
+        Scheduler.add(new Scheduler.Task() { public void perform() {
             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);
             }
-            */
         }});
     }
 
@@ -209,7 +207,7 @@ public abstract class Surface extends PixelBuffer {
      *  message), the subclass should use (-1,-1).
      */
     protected final void Move(final int newmousex, final int newmousey) {
-        Scheduler.add(lastMoveMessage = new Message() { public void perform() {
+        Scheduler.add(lastMoveMessage = new Scheduler.Task() { public void perform() {
             synchronized(Surface.this) {
 
                 // if move messages are arriving faster than we can process them, we just start ignoring them
@@ -225,7 +223,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();
@@ -234,19 +232,21 @@ public abstract class Surface extends PixelBuffer {
     }
 
     protected final void SizeChange(final int width, final int height) {
-        Scheduler.add(new Message() { public void perform() {
+        Scheduler.add(new Scheduler.Task() { public void perform() {
             if (width == root.width && height == root.height) return;
-            root.needs_reflow = true;
+            root.set(root.REFLOW);
+            platform_window_width = width;
+            platform_window_height = height;
             do { abort = false; root.reflow(width, height); } while(abort);
         }});
         abort = true;
     }
 
     protected final void PosChange(final int x, final int y) {
-        Scheduler.add(new Message() { public void perform() {
+        Scheduler.add(new Scheduler.Task() { public void perform() {
             root.x = x;
             root.y = y;
-            root.put("PosChange", Boolean.TRUE);
+            root.putAndTriggerJSTraps("PosChange", Boolean.TRUE);
         }});
     }
 
@@ -255,12 +255,15 @@ public abstract class Surface extends PixelBuffer {
     protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, root); }
     protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, root); }
     public static void Refresh() {
-        Scheduler.add(new Scheduler.Task() { public Object call(Object arg) {
-                for(int i=0; i<allSurfaces.size(); i++)
-                    ((Surface)allSurfaces.elementAt(i)).render();
-                return null;
+        Scheduler.add(new Scheduler.Task() { public void perform() {
+            renderAll();
         }}); }
 
+    public static void renderAll() {
+        for(int i=0; i<allSurfaces.size(); i++)
+            ((Surface)allSurfaces.elementAt(i)).render();
+    }
+
     public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); }
     public final void setMinimized(boolean b) { if (b != minimized) _setMinimized(minimized = b); }
 
@@ -283,15 +286,22 @@ public abstract class Surface extends PixelBuffer {
         Refresh();
     }
 
-    public Surface(Box root) {
+    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();
@@ -305,7 +315,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;
@@ -314,7 +324,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;
@@ -325,7 +335,7 @@ public abstract class Surface extends PixelBuffer {
             if (y+h > root.height) h = root.height - y;
             if (w <= 0 || h <= 0) continue;
 
-            root.render(0, 0, x, y, w, h, this, identity);
+            root.render(0, 0, x, y, x + w, y + h, this, identity);
             drawPicture(Main.scarImage,
                         0, root.height - Main.scarImage.getHeight(), 
                         x, y, w, h);
@@ -348,7 +358,7 @@ public abstract class Surface extends PixelBuffer {
     }
 
     // FEATURE: reinstate recycler
-    public class SimpleMessage extends Message {
+    public class SimpleMessage extends Scheduler.Task {
         
         private Box boxContainingMouse;
         private Object value;
@@ -361,7 +371,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 + "]"; }
 
     }
@@ -387,7 +397,8 @@ public abstract class Surface extends PixelBuffer {
 
         public void fillTrapezoid(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.fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
+        }
 
         public void render() {
             super.render();