X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=be363709a384804a04a665b1cf2409b6b67df1ac;hb=78c49c04f5b4718f99b1283a9b685e0785629928;hp=cfc993940d31237074053d85ac5416505f911388;hpb=96a87620560fafc2ca4002de50ff4ebbe4500f5d;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index cfc9939..be36370 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -2,6 +2,7 @@
 package org.xwt;
 
 import org.bouncycastle.util.encoders.Base64;
+import org.xwt.js.*;
 import org.xwt.util.*;
 import java.io.*;
 import java.util.*;
@@ -14,21 +15,17 @@ import java.util.*;
  *
  *  Note that the members in the section 'state variables' are either
  *  in real-time (the actual size/position/state), or in
- *  MessageQueue-time (the size/position/state at the time that the
+ *  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 abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
-    public int getWidth() { return root == null ? 0 : root.width; }
-    public int getHeight() { return root == null ? 0 : root.height; }
-        
     // Static Data ////////////////////////////////////////////////////////////////////////////////
 
-    /**< the most recently enqueued Move message; used to throttle the message rate */
-    private static Message lastMoveMessage = null;
+    private static Boolean T = Boolean.TRUE;
+    private static Boolean F = Boolean.FALSE;
 
-    /** all instances of Surface which need to be refreshed by the MessageQueue */
+    /** all instances of Surface which need to be refreshed by the Scheduler */
     public static Vec allSurfaces = new Vec();
     
     /** When set to true, render() should abort as soon as possible and restart the rendering process */
@@ -37,25 +34,25 @@ public abstract class Surface extends PixelBuffer {
     public static boolean alt = false;          ///< true iff the alt button is pressed down, in real time
     public static boolean control = false;      ///< true iff the control button is pressed down, in real time
     public static boolean shift = false;        ///< true iff the shift button is pressed down, in real time
-    public static boolean button1 = false;      ///< true iff button 1 is depressed, in MessageQueue-time
-    public static boolean button2 = false;      ///< true iff button 2 is depressed, in MessageQueue-time
-    public static boolean button3 = false;      ///< true iff button 3 is depressed, in MessageQueue-time
+    public static boolean button1 = false;      ///< true iff button 1 is depressed, in Scheduler-time
+    public static boolean button2 = false;      ///< true iff button 2 is depressed, in Scheduler-time
+    public static boolean button3 = false;      ///< true iff button 3 is depressed, in Scheduler-tiem
 
      
 
     // Instance Data ///////////////////////////////////////////////////////////////////////
 
-    public Box root;      /**< The Box at the root of this surface */
-    public String cursor = "default";
-
-    public int mousex;                    ///< the x position of the mouse, relative to this Surface, in MessageQueue-time
-    public int mousey;                    ///< the y position of the mouse, relative to this Surface, in MessageQueue-time
-    public boolean minimized = false;     ///< True iff this surface is minimized, in real time
-    public boolean maximized = false;     ///< True iff this surface is maximized, in real time
-
-    /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */
-    private DirtyList dirtyRegions = new DirtyList();
+    Vec keywatchers = new Vec();
 
+    public Box root;                                   ///< The Box at the root of this surface
+    public String cursor = "default";                  ///< The active cursor to switch to when syncCursor() is called
+    public int mousex;                                 ///< x position of the mouse, in Scheduler-time
+    public int mousey;                                 ///< y position of the mouse, in Scheduler-time
+    public int newmousex = -1;                         ///< x position of the mouse, in realtime
+    public int newmousey = -1;                         ///< y position of the mouse, in realtime
+    public boolean minimized = false;                  ///< True iff this surface is minimized, in real time
+    public boolean maximized = false;                  ///< True iff this surface is maximized, in real time
+    private DirtyList dirtyRegions = new DirtyList();  ///< Dirty regions on the *screen*
 
     // Used For Simulating Clicks and DoubleClicks /////////////////////////////////////////////////
 
@@ -67,18 +64,18 @@ public abstract class Surface extends PixelBuffer {
     
     // Methods to be overridden by subclasses ///////////////////////////////////////////////////////
 
-    public abstract void toBack();      ///< when invoked, the surface should push itself to the back of the stacking order
-    public abstract void toFront();     ///< when invoked, the surface should pull itself to the front of the stacking order
-    public abstract void syncCursor();  ///< the <i>actual</i> cursor for this surface to the cursor referenced by <tt>cursor</tt>
+    public abstract void toBack();                     ///< should push surface to the back of the stacking order
+    public abstract void toFront();                    ///< should pull surface to the front of the stacking order
+    public abstract void syncCursor();                 ///< set the actual cursor to this.cursor if they do not match
     public abstract void setInvisible(boolean b);      ///< If <tt>b</tt>, make window invisible; otherwise, make it non-invisible.
     protected abstract void _setMaximized(boolean b);  ///< If <tt>b</tt>, maximize the surface; otherwise, un-maximize it.
     protected abstract void _setMinimized(boolean b);  ///< If <tt>b</tt>, minimize the surface; otherwise, un-minimize it.
-    protected abstract void setSize(int width, int height);  ///< Sets the surface's width and height.
-    public abstract void setLocation();                      ///< Set the surface's x/y position to that of the root box
-    public abstract void setTitleBarText(String s);      ///< Sets the surface's title bar text, if applicable
-    public abstract void setIcon(Picture i);      ///< Sets the surface's title bar text, if applicable
-    public abstract void _dispose();      ///< Destroy the surface
-    public void setLimits(int min_width, int min_height, int max_width, int max_height) { }
+    public abstract void setLocation();                ///< Set the surface's x/y position to that of the root box
+    protected abstract void _setSize(int w, int h);    ///< set the actual size of the surface
+    public abstract void setTitleBarText(String s);    ///< Sets the surface's title bar text, if applicable
+    public abstract void setIcon(Picture i);           ///< Sets the surface's title bar text, if applicable
+    public abstract void _dispose();                   ///< Destroy the surface
+    public void setLimits(int min_width, int min_height, int max_width, int max_height) { /* FIXME */ }
 
 
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
@@ -91,13 +88,13 @@ public abstract class Surface extends PixelBuffer {
         else if (button == 2) button2 = true;
         else if (button == 3) button3 = true;
 
-        if (button == 1) new SimpleMessage("Press1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 2) new SimpleMessage("Press2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+        if (button == 1) new SimpleMessage("Press1", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 2) new SimpleMessage("Press2", T, Box.whoIs(root, mousex, mousey));
         else if (button == 3) {
             final Box who = Box.whoIs(root, mousex, mousey);
-            Message.Q.add(new Message() { public void perform() {
+            Scheduler.add(new Scheduler.Task() { public void perform() {
                 Platform.clipboardReadEnabled = true;
-                root.put("Press3", Boolean.TRUE);
+                root.putAndTriggerTraps("Press3", T);
                 Platform.clipboardReadEnabled = false;
             }});
         }
@@ -108,9 +105,9 @@ public abstract class Surface extends PixelBuffer {
         else if (button == 2) button2 = false;
         else if (button == 3) button3 = false;
 
-        if (button == 1) new SimpleMessage("Release1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 2) new SimpleMessage("Release2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 3) new SimpleMessage("Release3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+        if (button == 1) new SimpleMessage("Release1", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 2) new SimpleMessage("Release2", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 3) new SimpleMessage("Release3", T, Box.whoIs(root, mousex, mousey));
 
         if (Platform.needsAutoClick() && Math.abs(last_press_x - mousex) < 5 && Math.abs(last_press_y - mousey) < 5) Click(button);
         last_press_x = Integer.MAX_VALUE;
@@ -118,9 +115,9 @@ public abstract class Surface extends PixelBuffer {
     }
 
     protected final void Click(int button) {
-        if (button == 1) new SimpleMessage("Click1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 2) new SimpleMessage("Click2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 3) new SimpleMessage("Click3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+        if (button == 1) new SimpleMessage("Click1", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 2) new SimpleMessage("Click2", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 3) new SimpleMessage("Click3", T, Box.whoIs(root, mousex, mousey));
         if (Platform.needsAutoDoubleClick()) {
             long now = System.currentTimeMillis();
             if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button);
@@ -130,64 +127,65 @@ public abstract class Surface extends PixelBuffer {
     }
 
     protected final void DoubleClick(int button) {
-        if (button == 1) new SimpleMessage("DoubleClick1", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 2) new SimpleMessage("DoubleClick2", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
-        else if (button == 3) new SimpleMessage("DoubleClick3", Boolean.TRUE, Box.whoIs(root, mousex, mousey));
+        if (button == 1) new SimpleMessage("DoubleClick1", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 2) new SimpleMessage("DoubleClick2", T, Box.whoIs(root, mousex, mousey));
+        else if (button == 3) new SimpleMessage("DoubleClick3", T, Box.whoIs(root, mousex, mousey));
     }
 
-    /** sends a KeyPressed message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+    /** Send a KeyPressed message; subclasses should not add the C- or A- prefixes or should they capitalize alphabet chars */
     protected final void KeyPressed(String key) {
         if (key == null) return;
-
-        if (key.toLowerCase().endsWith("shift")) shift = true;
-        else if (shift) key = key.toUpperCase();
-
-        if (key.toLowerCase().equals("alt")) alt = true;
-        else if (alt) key = "A-" + key;
-
-        if (key.toLowerCase().endsWith("control")) control = true;
-        else if (control) key = "C-" + key;
-
-        final String fkey = key;
-        Message.Q.add(new KMessage(key));
+        if (key.toLowerCase().endsWith("shift")) shift = true;     else if (shift) key = key.toUpperCase();
+        if (key.toLowerCase().equals("alt")) alt = true;           else if (alt) key = "A-" + key;
+        if (key.toLowerCase().endsWith("control")) control = true; else if (control) key = "C-" + key;
+        Scheduler.add(new KMessage(key));
     }
 
     // This is implemented as a private static class instead of an anonymous class to work around a GCJ bug
-    private class KMessage implements Message {
+    private class KMessage implements 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.putAndTriggerTraps("KeyPressed", key);
             }
-            */
             Platform.clipboardReadEnabled = false;
         }
     }
 
-    /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes, nor should they capitalize alphabet characters */
+    /** sends a KeyReleased message; subclasses should not add the C- or A- prefixes or capitalize alpha chars */
     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;
-        Message.Q.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.putAndTriggerTraps("KeyReleased", key);
             }
-            */
         }});
     }
 
+    /** we enqueue ourselves in the Scheduler when we have a Move message to deal with */
+    public void perform() {
+        if (mousex == newmousex && mousey == newmousey) return;
+        int oldmousex = mousex;     mousex = newmousex;
+        int oldmousey = mousey;     mousey = newmousey;
+        String oldcursor = cursor;  cursor = "default";
+        // Root gets motion events outside itself (if trapped)
+        if (!root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
+            root.putAndTriggerTraps("Move", T);
+        root.Move(oldmousex, oldmousey, mousex, mousey);
+        if (!cursor.equals(oldcursor)) syncCursor();
+    }
+
     /**
      *  Notify XWT that the mouse has moved. If the mouse leaves the
      *  surface, but the host windowing system does not provide its new
@@ -195,51 +193,42 @@ public abstract class Surface extends PixelBuffer {
      *  message), the subclass should use (-1,-1).
      */
     protected final void Move(final int newmousex, final int newmousey) {
-        Message.Q.add(lastMoveMessage = new Message() { public void perform() {
-            synchronized(Surface.this) {
-
-                // if move messages are arriving faster than we can process them, we just start ignoring them
-                if (lastMoveMessage != this) return;
-
-                int oldmousex = mousex;
-                int oldmousey = mousey;
-                mousex = newmousex;
-                mousey = newmousey;
-
-                String oldcursor = cursor;
-                cursor = "default";
-
-                // 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.Move(oldmousex, oldmousey, mousex, mousey);
-                if (!cursor.equals(oldcursor)) syncCursor();
-            }
-        }});
+        this.newmousex = newmousex;
+        this.newmousey = newmousey;
+        Scheduler.add(this);
     }
 
+    // FEATURE: can we avoid creating objects here?
     protected final void SizeChange(final int width, final int height) {
-        Message.Q.add(new Message() { public void perform() {
-            if (width == root.width && height == root.height) return;
-            root.needs_reflow = true;
-            do { root.reflow(width, height); } while(abort);
+        Scheduler.addAtFront(new Scheduler.Task() { public void perform() {
+            // dirty the place where the scar used to be
+            root.dirty(0, root.maxheight - Main.scarImage.height, Main.scarImage.width, Main.scarImage.height);
+            root.setMaxWidth(JS.N(width));
+            root.setMaxHeight(JS.N(height));
+            root.set(root.REFLOW);
         }});
         abort = true;
     }
 
+    // FEATURE: can we avoid creating objects here?
     protected final void PosChange(final int x, final int y) {
-        Message.Q.add(new Message() { public void perform() {
-            root.put("x", new Integer(x));
-            root.put("y", new Integer(y));
+        Scheduler.add(new Scheduler.Task() { public void perform() {
+            root.x = x;
+            root.y = y;
+            root.putAndTriggerTraps("PosChange", T);
         }});
     }
 
-    protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, root); }
-    protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, root); }
-    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() { Message.Q.refresh(); }
+    protected final void Close() { new SimpleMessage("Close", T, root); }
+    protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? T : F, root); }
+    protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? T : F, root); }
+    protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? T : F, root); }
+    public static void Refresh() { Scheduler.add(renderAll); }
+
+    public static final Scheduler.Task renderAll = new Scheduler.Task() { public void perform() {
+        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); }
@@ -247,13 +236,6 @@ public abstract class Surface extends PixelBuffer {
 
     // Other Methods ///////////////////////////////////////////////////////////////////////////////
 
-    /** wrapper for setSize() which makes sure to dirty the place where the scar used to be */
-    void setSize() {
-        root.width = Math.max(root.width, 10);
-        root.height = Math.max(root.height, 10);
-        setSize(root.width, root.height);
-    }
-
     /** Indicates that the Surface is no longer needed */
     public final void dispose(boolean quitIfAllSurfacesGone) {
         if (Log.on) Log.log(this, "disposing " + this);
@@ -270,17 +252,21 @@ 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);
-        else root.remove();
-        root.surface = this;
-
-        // make sure the root is properly sized
-        do { abort = false; root.reflow(); } while(abort);
-
-        root.dirty();
+        root.setMaxWidth(JS.N(Math.min(Platform.getScreenWidth(), root.maxwidth)));
+        root.setMaxHeight(JS.N(Math.min(Platform.getScreenHeight(), root.maxheight)));
+        Surface old = fromBox(root);
+        if (old != null) old.dispose(false);
+        else root.removeSelf();
         Refresh();
     }
 
@@ -289,18 +275,23 @@ public abstract class Surface extends PixelBuffer {
     /** runs the prerender() and render() pipelines in the root Box to regenerate the backbuffer, then blits it to the screen */
     public synchronized void render() {
 
+        // dirty the place where the scar used to be in case the root window size was programmatically changed
+        if (root.maxwidth != root.width || root.maxheight != root.height)
+            root.dirty(0, root.height - Main.scarImage.height, Main.scarImage.width, Main.scarImage.height);
+
         // make sure the root is properly sized
         do {
             abort = false;
-            root.reflow();
-            // update mouseinside and trigger Enter/Leave as a result of box size/position changes
+            root.repack();
+            root.resize(root.x, root.y, root.maxwidth, root.maxheight);
+            root.resize_children();
+            _setSize(root.width, root.height);
             String oldcursor = cursor;
             cursor = "default";
             root.Move(mousex, mousey, mousex, mousey);
             if (!cursor.equals(oldcursor)) syncCursor();
         } while(abort);
 
-        Box.sizePosChangesSinceLastRender = 0;
         int[][] dirt = dirtyRegions.flush();
         for(int i = 0; dirt != null && i < dirt.length; i++) {
             if (dirt[i] == null) continue;
@@ -311,7 +302,8 @@ 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.height, x, y, w, h);
             
             if (abort) {
 
@@ -331,7 +323,7 @@ public abstract class Surface extends PixelBuffer {
     }
 
     // FEATURE: reinstate recycler
-    public class SimpleMessage implements Message {
+    public class SimpleMessage implements Scheduler.Task {
         
         private Box boxContainingMouse;
         private Object value;
@@ -341,10 +333,10 @@ public abstract class Surface extends PixelBuffer {
             this.boxContainingMouse = boxContainingMouse;
             this.name = name;
             this.value = value;
-            Message.Q.add(this);
+            Scheduler.add(this);
         }
         
-        public void perform() { boxContainingMouse.put(name, value); }
+        public void perform() { boxContainingMouse.putAndTriggerTraps(name, value); }
         public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
 
     }
@@ -358,20 +350,20 @@ public abstract class Surface extends PixelBuffer {
         PixelBuffer backbuffer = Platform.createPixelBuffer(Platform.getScreenWidth(), Platform.getScreenHeight(), this);
         DirtyList screenDirtyRegions = new DirtyList();
 
-        public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2) {
-            screenDirtyRegions.dirty(dx1, dy1, dx2 - dx1, dy2 - dy1);
-            backbuffer.drawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2); }
+        public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
+            screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
+            backbuffer.drawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
+        }
 
-        public void drawPictureAlphaOnly(Picture source,
-                                         int dx1, int dy1, int dx2, int dy2,
-                                         int sx1, int sy1, int sx2, int sy2,
-                                         int argb) {
-            screenDirtyRegions.dirty(dx1, dy1, dx2 - dx1, dy2 - dy1);
-            backbuffer.drawPictureAlphaOnly(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, argb); }
+        public void drawGlyph(Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int argb) {
+            screenDirtyRegions.dirty(cx1, cy1, cx2 - cx1, cy2 - cy1);
+            backbuffer.drawGlyph(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) {
             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();