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

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index b0b8df1..3a083cc 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -24,13 +24,8 @@ public abstract class Surface extends PixelBuffer {
         
     // 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 Scheduler.Task lastMoveMessage = null;
 
     /** all instances of Surface which need to be refreshed by the Scheduler */
     public static Vec allSurfaces = new Vec();
@@ -84,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 ////////////////////////////////////////////////////////////
@@ -107,7 +106,7 @@ 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.putAndTriggerJSTraps("Press3", Boolean.TRUE);
                 Platform.clipboardReadEnabled = false;
@@ -147,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;
 
@@ -165,7 +166,7 @@ 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() {
@@ -182,13 +183,14 @@ public abstract class Surface extends PixelBuffer {
 
     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,
+     *  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() {
+        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)
@@ -205,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
@@ -230,16 +232,18 @@ 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.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.putAndTriggerJSTraps("PosChange", Boolean.TRUE);
@@ -291,7 +295,6 @@ public abstract class Surface extends PixelBuffer {
     }
 
     public Surface(Box root) {
-
         this.root = root;
         Surface old = fromBox(root);
         if (old != null) old.dispose(false);
@@ -332,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);
@@ -355,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;
@@ -392,9 +395,10 @@ public abstract class Surface extends PixelBuffer {
             backbuffer.drawPictureAlphaOnly(source, dx, dy, cx1, cy1, cx2, cy2, argb);
         }
 
-        public void fillJSTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int color) {
+        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.fillJSTrapezoid(x1, x2, y1, x3, x4, y2, color); }
+            backbuffer.fillTrapezoid(x1, x2, y1, x3, x4, y2, color);
+        }
 
         public void render() {
             super.render();