X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=ae857452f334e7c67b460874ccd7c42095221f66;hb=e1bf2123524ba1cc258188314733f62c2bf45c00;hp=36c82ee0d8b5e7eee933532daa1c596582389679;hpb=a7bc8922080f56017b141a3835c722344fa4cffc;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 36c82ee..ae85745 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.*;
@@ -17,20 +18,12 @@ import java.util.*;
  *  Scheduler-time (the size/position/state at the time that the
  *  now-executing message was enqueued). This distinction is important.
  */
-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 ////////////////////////////////////////////////////////////////////////////////
 
-    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 Boolean T = Boolean.TRUE;
+    private static Boolean F = Boolean.FALSE;
 
     /** all instances of Surface which need to be refreshed by the Scheduler */
     public static Vec allSurfaces = new Vec();
@@ -49,16 +42,21 @@ public abstract class Surface extends PixelBuffer {
 
     // 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 Scheduler-time
-    public int mousey;                    ///< the y position of the mouse, relative to this Surface, in Scheduler-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
+    Vec keywatchers = new Vec();
 
-    /** Dirty regions on the backbuffer which need to be rebuilt using Box.render() */
-    private DirtyList dirtyRegions = new DirtyList();
+    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*
+    private int width = 0;                             ///< The actual width of the surface
+    private int height = 0;                            ///< The actual height of the surface
+    public int getWidth() { return width; }
+    public int getHeight() { return height; }
 
 
     // Used For Simulating Clicks and DoubleClicks /////////////////////////////////////////////////
@@ -71,34 +69,33 @@ 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.
-    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 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
+
+
+    // Sizing /////////////////////////////////////////////////////////////////////////////////
+
     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);
-        }
-        if (root.width > 0 && root.height > 0 && platform_window_width != root.width && platform_window_height != root.height)
-            _setSize(root.width, root.height);
+
+    public final void setWidth(int width) { setSize(width, this.height); }
+    public final void setHeight(int height) { setSize(this.width, height); }
+    public final void setSize(int width, int height) {
+        if (this.width == width && this.height == height) return;
+        this.width = Math.max(Main.scarImage.width, width);
+        this.height = Math.max(Main.scarImage.height, height);
+        _setSize(width, height);
     }
 
+
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
 
     protected final void Press(final int button) {
@@ -109,13 +106,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);
-            Scheduler.add(new Message() { public void perform() {
+            Scheduler.add(new Scheduler.Task() { public void perform() {
                 Platform.clipboardReadEnabled = true;
-                root.putAndTriggerJSTraps("Press3", Boolean.TRUE);
+                root.putAndTriggerTraps("Press3", T);
                 Platform.clipboardReadEnabled = false;
             }});
         }
@@ -126,9 +123,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;
@@ -136,9 +133,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);
@@ -148,30 +145,22 @@ 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;
+        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 extends Message {
+    private class KMessage implements Scheduler.Task {
         String key = null;
         public KMessage(String k) { key = k; }
         public void perform() {
@@ -180,30 +169,41 @@ public abstract class Surface extends PixelBuffer {
                 Box b = (Box)keywatchers.elementAt(i);
                 for(Box cur = b; cur != null; cur = cur.parent)
                     if (!cur.test(cur.VISIBLE)) continue outer;
-                b.putAndTriggerJSTraps("KeyPressed", key);
+                b.putAndTriggerTraps("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 */
+    /** 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;
-        Scheduler.add(new Message() { public void perform() {
+        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.parent)
                     if (!cur.test(cur.VISIBLE)) continue outer;
-                b.putAndTriggerJSTraps("KeyReleased", key);
+                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
@@ -211,62 +211,40 @@ 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() {
-            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.putAndTriggerJSTraps("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) {
-        Scheduler.add(new Message() { public void perform() {
-            if (width == root.width && height == root.height) return;
+        Scheduler.add(new Scheduler.Task() { public void perform() {
             root.set(root.REFLOW);
-            platform_window_width = width;
-            platform_window_height = height;
-            do { abort = false; root.reflow(width, height); } while(abort);
+            Surface.this.width = width;
+            Surface.this.height = height;
         }});
         abort = true;
     }
 
+    // FEATURE: can we avoid creating objects here?
     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.putAndTriggerJSTraps("PosChange", Boolean.TRUE);
+            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() {
-        Scheduler.add(new Scheduler.Task() { public void perform() {
-            renderAll();
-        }}); }
+    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 void 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); }
@@ -302,12 +280,7 @@ public abstract class Surface extends PixelBuffer {
         this.root = root;
         Surface old = fromBox(root);
         if (old != null) old.dispose(false);
-        else root.remove();
-
-        // make sure the root is properly sized
-        do { abort = false; root.reflow(root.width, root.height); } while(abort);
-
-        root.dirty();
+        else root.removeSelf();
         Refresh();
     }
 
@@ -316,19 +289,21 @@ 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
+        if (root.width != width || root.height != 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(root.width, root.height);
-            setSize(root.width, root.height);
-            // update mouseinside and trigger Enter/Leave as a result of box size/position changes
+            root.reflow(width, height);
+            setSize(width, 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;
@@ -340,9 +315,7 @@ public abstract class Surface extends PixelBuffer {
             if (w <= 0 || h <= 0) continue;
 
             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);
+            drawPicture(Main.scarImage, 0, root.height - Main.scarImage.height, x, y, w, h);
             
             if (abort) {
 
@@ -362,7 +335,7 @@ public abstract class Surface extends PixelBuffer {
     }
 
     // FEATURE: reinstate recycler
-    public class SimpleMessage extends Message {
+    public class SimpleMessage implements Scheduler.Task {
         
         private Box boxContainingMouse;
         private Object value;
@@ -375,7 +348,7 @@ public abstract class Surface extends PixelBuffer {
             Scheduler.add(this);
         }
         
-        public void perform() { boxContainingMouse.putAndTriggerJSTraps(name, value); }
+        public void perform() { boxContainingMouse.putAndTriggerTraps(name, value); }
         public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
 
     }
@@ -394,9 +367,9 @@ public abstract class Surface extends PixelBuffer {
             backbuffer.drawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
         }
 
-        public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int 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.drawPictureAlphaOnly(source, dx, dy, cx1, cy1, cx2, cy2, argb);
+            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) {