2003/12/30 23:14:09

[org.ibex.core.git] / src / org / xwt / Surface.java

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 35c1d89..861d797 100644 (file)
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -32,6 +32,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     volatile boolean abort = false;
     volatile int pendingWidth = -1;
     volatile int pendingHeight = -1;
+    volatile int actualWidth = -1;
+    volatile int actualHeight = -1;
 
     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
@@ -79,6 +81,12 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     public abstract void _dispose();                   ///< Destroy the surface
     public void setLimits(int min_width, int min_height, int max_width, int max_height) { /* FIXME */ }
 
+    protected void setSize(int w, int h) {
+        if (w == actualWidth && h == actualHeight) return;
+        actualWidth = w;
+        actualHeight = h;
+        _setSize(w, h);
+    }
 
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
 
@@ -162,10 +170,11 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
     /** subclasses should invoke this method when the user resizes the window */
     protected final void SizeChange(final int width, final int height) {
-        pendingWidth = width;
-        pendingHeight = height;
-        Refresh();
-        Scheduler.add(new Scheduler.Task() { public void perform() { }});
+        if (pendingWidth == width && pendingHeight == height) return;
+        actualWidth = pendingWidth = width;
+        actualHeight = pendingHeight = height;
+        abort = true;
+        Scheduler.renderAll();
     }
 
     // FEATURE: can we avoid creating objects here?
@@ -185,7 +194,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     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 void Refresh() { abort = true; }
+    public void Refresh() { Scheduler.add(new Scheduler.Task() { public void perform() { } }); }
 
     public final void setMaximized(boolean b) { if (b != maximized) _setMaximized(maximized = b); }
     public final void setMinimized(boolean b) { if (b != minimized) _setMinimized(minimized = b); }
@@ -231,18 +240,21 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
     /** runs the prerender() and render() pipelines in the root Box to regenerate the backbuffer, then blits it to the screen */
     public synchronized void render() {
+
         // make sure the root is properly sized
         do {
             abort = false;
             root.repack();
             if (pendingWidth != -1) root.setMaxWidth(JS.N(pendingWidth));
             if (pendingHeight != -1) root.setMaxHeight(JS.N(pendingHeight));
-            // 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);
+            if (root.maxwidth != root.width || root.maxheight != root.height) {
+                // dirty the place where the scar used to be and where it is now
+                dirty(0, root.height - Main.scarImage.height, Main.scarImage.width, Main.scarImage.height);
+                dirty(0, root.maxheight - Main.scarImage.height, Main.scarImage.width, Main.scarImage.height);
+            }
             root.resize(root.x, root.y, root.maxwidth, root.maxheight);
             root.resize_children();
-            _setSize(root.width, root.height);
+            setSize(root.width, root.height);
             String oldcursor = cursor;
             cursor = "default";
             root.putAndTriggerTrapsAndCatchExceptions("_Move", JS.T);
@@ -260,7 +272,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
             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.height, x, y, w, h);
+            drawPicture(Main.scarImage, 0, root.height - Main.scarImage.height, x, y, x+w, y+h);
             
             if (abort) {