X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=70dd5671d6ae6b5a3359d02200f1ec3adbb8c128;hb=16ad8b9430571d806f2aeb18ec472a277ff69423;hp=e28dbcdc81cd8dc66b6ce7bdfca2f373c17ff084;hpb=b4683a8f73d90fc0d4926775dfbc7268c34e6bff;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index e28dbcd..70dd567 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import org.bouncycastle.util.encoders.Base64;
@@ -12,11 +12,6 @@ import java.util.*;
  *
  *  Platform subclasses should include an inner class subclass of
  *  Surface to return from the Platform._createSurface() method
- *
- *  Note that the members in the section 'state variables' are either
- *  in real-time (the actual size/position/state), or in
- *  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 implements Scheduler.Task {
 
@@ -30,31 +25,33 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     
     /** When set to true, render() should abort as soon as possible and restart the rendering process */
     volatile boolean abort = false;
-    volatile int pendingWidth = -1;
-    volatile int pendingHeight = -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
-    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 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
+    // these three variables are used to ensure that user resizes trump programmatic resizes
+    volatile boolean syncRootBoxToSurface = false;
+    volatile int pendingWidth = 0;
+    volatile int pendingHeight = 0;
+
+    public static boolean alt = false;          ///< true iff the alt button is pressed down
+    public static boolean control = false;      ///< true iff the control button is pressed down
+    public static boolean shift = false;        ///< true iff the shift button is pressed down
+    public static boolean button1 = false;      ///< true iff button 1 is depressed
+    public static boolean button2 = false;      ///< true iff button 2 is depressed
+    public static boolean button3 = false;      ///< true iff button 3 is depressed
 
-     
 
     // Instance Data ///////////////////////////////////////////////////////////////////////
 
     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 _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 int mousex;                                 ///< x position of the mouse
+    public int mousey;                                 ///< y position of the mouse
+    public int _mousex;                                ///< x position of the mouse FIXME
+    public int _mousey;                                ///< y position of the mouse FIXME
+    public int newmousex = -1;                         ///< x position of the mouse, in real time; this lets us collapse Move's
+    public int newmousey = -1;                         ///< y position of the mouse, in real time; this lets us collapse Move's
     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
-    DirtyList dirtyRegions = new DirtyList();  ///< Dirty regions on the *screen*
+    DirtyList dirtyRegions = new DirtyList();          ///< Dirty regions on the surface
 
     // Used For Simulating Clicks and DoubleClicks /////////////////////////////////////////////////
 
@@ -77,7 +74,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     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 */ }
+    public void setMinimumSize(int minx, int miny, boolean resizable) { }
+    protected void setSize(int w, int h) { _setSize(w, h); }
 
 
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
@@ -90,8 +88,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         else if (button == 2) button2 = true;
         else if (button == 3) button3 = true;
 
-        if (button == 1) new SimpleMessage("_Press1", T, root);
-        else if (button == 2) new SimpleMessage("_Press2", T, root);
+        if (button == 1) new Message("_Press1", T, root);
+        else if (button == 2) new Message("_Press2", T, root);
         else if (button == 3) {
             final Box who = root;
             Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn {
@@ -110,9 +108,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         else if (button == 2) button2 = false;
         else if (button == 3) button3 = false;
 
-        if (button == 1) new SimpleMessage("_Release1", T, root);
-        else if (button == 2) new SimpleMessage("_Release2", T, root);
-        else if (button == 3) new SimpleMessage("_Release3", T, root);
+        if (button == 1) new Message("_Release1", T, root);
+        else if (button == 2) new Message("_Release2", T, root);
+        else if (button == 3) new Message("_Release3", T, root);
 
         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;
@@ -120,9 +118,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     }
 
     protected final void Click(int button) {
-        if (button == 1) new SimpleMessage("_Click1", T, root);
-        else if (button == 2) new SimpleMessage("_Click2", T, root);
-        else if (button == 3) new SimpleMessage("_Click3", T, root);
+        if (button == 1) new Message("_Click1", T, root);
+        else if (button == 2) new Message("_Click2", T, root);
+        else if (button == 3) new Message("_Click3", T, root);
         if (Platform.needsAutoDoubleClick()) {
             long now = System.currentTimeMillis();
             if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button);
@@ -139,12 +137,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         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))
-            try {
-                root.putAndTriggerTraps("_Move", T);
-            } catch (JSExn e) {
-                Log.log(Surface.class, "Exception thrown from Move message handler");
-                Log.logJS(e);
-            }
+            root.putAndTriggerTrapsAndCatchExceptions("_Move", T);
         if (!cursor.equals(oldcursor)) syncCursor();
     }
 
@@ -162,9 +155,12 @@ 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) {
+        if (pendingWidth == width && pendingHeight == height) return;
         pendingWidth = width;
         pendingHeight = height;
-        Refresh();
+        syncRootBoxToSurface = true;
+        abort = true;
+        Scheduler.renderAll();
     }
 
     // FEATURE: can we avoid creating objects here?
@@ -172,19 +168,19 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn {
             root.x = x;
             root.y = y;
-            root.putAndTriggerTraps("PosChange", T);
+            root.putAndTriggerTrapsAndCatchExceptions("PosChange", T);
         }});
     }
 
     private final String[] doubleClick = new String[] { null, "_DoubleClick1", "_DoubleClick2", "_DoubleClick3" };
-    protected final void DoubleClick(int button) { new SimpleMessage(doubleClick[button], T, root); }
-    protected final void KeyPressed(String key) { new SimpleMessage("_KeyPressed", key, root); }
-    protected final void KeyReleased(String key) { new SimpleMessage("_KeyReleased", key, root); }
-    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 void Refresh() { abort = true; }
+    protected final void DoubleClick(int button) { new Message(doubleClick[button], T, root); }
+    protected final void KeyPressed(String key) { new Message("_KeyPressed", key, root); }
+    protected final void KeyReleased(String key) { new Message("_KeyReleased", key, root); }
+    protected final void Close() { new Message("Close", T, root); }
+    protected final void Minimized(boolean b) { minimized = b; new Message("Minimized", b ? T : F, root); }
+    protected final void Maximized(boolean b) { maximized = b; new Message("Maximized", b ? T : F, root); }
+    protected final void Focused(boolean b) { new Message("Focused", b ? T : F, root); }
+    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); }
@@ -194,11 +190,11 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
     /** Indicates that the Surface is no longer needed */
     public final void dispose(boolean quitIfAllSurfacesGone) {
-        if (Log.on) Log.log(this, "disposing " + this);
+        if (Log.on) Log.info(this, "disposing " + this);
         allSurfaces.removeElement(this);
         _dispose();
         if (allSurfaces.size() == 0) {
-            if (Log.on) Log.log(this, "exiting because last surface was destroyed");
+            if (Log.on) Log.info(this, "exiting because last surface was destroyed");
             System.exit(0);
         }
     }
@@ -209,6 +205,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     }
 
     public static Surface fromBox(Box b) {
+        // FIXME use a hash table here
         for(int i=0; i<allSurfaces.size(); i++) {
             Surface s = (Surface)allSurfaces.elementAt(i);
             if (s.root == b) return s;
@@ -230,18 +227,24 @@ 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 (syncRootBoxToSurface) {
+                root.setMaxWidth(JS.N(pendingWidth));
+                root.setMaxHeight(JS.N(pendingHeight));
+                syncRootBoxToSurface = false;
+            }
+            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);
@@ -259,31 +262,28 @@ 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) {
-
                 // x,y,w,h is only partially reconstructed, so we must be careful not to re-blit it
                 dirtyRegions.dirty(x, y, w, h);
-
                 // put back all the dirty regions we haven't yet processed (including the current one)
                 for(int j=i; j<dirt.length; j++)
                     if (dirt[j] != null)
                         dirtyRegions.dirty(dirt[j][0], dirt[j][1], dirt[j][2], dirt[j][3]);
-
                 return;
             }
         }
     }
 
     // FEATURE: reinstate recycler
-    public class SimpleMessage implements Scheduler.Task {
+    public class Message implements Scheduler.Task {
         
         private Box boxContainingMouse;
         private Object value;
         public String name;
         
-        SimpleMessage(String name, Object value, Box boxContainingMouse) {
+        Message(String name, Object value, Box boxContainingMouse) {
             this.boxContainingMouse = boxContainingMouse;
             this.name = name;
             this.value = value;
@@ -297,23 +297,21 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 if (value.toLowerCase().equals("alt")) alt = true;           else if (alt) value = "A-" + value;
                 if (value.toLowerCase().endsWith("control")) control = true; else if (control) value = "C-" + value;
                 if (value.equals("C-v") || value.equals("A-v")) Platform.clipboardReadEnabled = true;
+                this.value = value;
             } else if (name.equals("_KeyReleased")) {
                 String value = (String)this.value;
                 if (value.toLowerCase().equals("alt")) alt = false;
                 else if (value.toLowerCase().equals("control")) control = false;
                 else if (value.toLowerCase().equals("shift")) shift = false;
+                this.value = value;
             }
             try {
-                boxContainingMouse.putAndTriggerTraps(name, value);
-            } catch (JSExn e) {
-                Log.log(Surface.class, "Exception thrown from "+name+" handler");
-                Log.logJS(e);
+                boxContainingMouse.putAndTriggerTrapsAndCatchExceptions(name, value);
             } finally {
                 Platform.clipboardReadEnabled = false;
             }
         }
-        public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
-
+        public String toString() { return "Message [name=" + name + ", value=" + value + "]"; }
     }