X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=5e517c834d0f0653676a1eabbcce6c297e275049;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=ae857452f334e7c67b460874ccd7c42095221f66;hpb=2ccad2219888c9942f62ae8b4d4207f655690948;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index ae85745..5e517c8 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;
@@ -29,35 +29,34 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     public static Vec allSurfaces = new Vec();
     
     /** When set to true, render() should abort as soon as possible and restart the rendering process */
-    static volatile boolean abort = false;
+    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
     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-time
+    public static boolean button3 = false;      ///< true iff button 3 is depressed, in Scheduler-tiem
 
      
 
     // Instance Data ///////////////////////////////////////////////////////////////////////
 
-    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 _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; }
-
+    DirtyList dirtyRegions = new DirtyList();  ///< Dirty regions on the *screen*
 
     // Used For Simulating Clicks and DoubleClicks /////////////////////////////////////////////////
 
@@ -80,22 +79,15 @@ 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 */ }
 
-
-    // Sizing /////////////////////////////////////////////////////////////////////////////////
-
-    public void setLimits(int min_width, int min_height, int max_width, int max_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);
+    protected void setSize(int w, int h) {
+        if (w == actualWidth && h == actualHeight) return;
+        actualWidth = w;
+        actualHeight = h;
+        _setSize(w, h);
     }
 
-
     // Helper methods for subclasses ////////////////////////////////////////////////////////////
 
     protected final void Press(final int button) {
@@ -106,14 +98,17 @@ 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, Box.whoIs(root, mousex, mousey));
-        else if (button == 2) new SimpleMessage("Press2", T, Box.whoIs(root, mousex, mousey));
+        if (button == 1) new SimpleMessage("_Press1", T, root);
+        else if (button == 2) new SimpleMessage("_Press2", T, root);
         else if (button == 3) {
-            final Box who = Box.whoIs(root, mousex, mousey);
-            Scheduler.add(new Scheduler.Task() { public void perform() {
+            final Box who = root;
+            Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn {
                 Platform.clipboardReadEnabled = true;
-                root.putAndTriggerTraps("Press3", T);
-                Platform.clipboardReadEnabled = false;
+                try {
+                    root.putAndTriggerTraps("_Press3", T);
+                } finally {
+                    Platform.clipboardReadEnabled = false;
+                }
             }});
         }
     }
@@ -123,9 +118,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, 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 (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 (Platform.needsAutoClick() && Math.abs(last_press_x - mousex) < 5 && Math.abs(last_press_y - mousey) < 5) Click(button);
         last_press_x = Integer.MAX_VALUE;
@@ -133,9 +128,9 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     }
 
     protected final void Click(int button) {
-        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 (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 (Platform.needsAutoDoubleClick()) {
             long now = System.currentTimeMillis();
             if (lastClickButton == button && now - lastClickTime < 350) DoubleClick(button);
@@ -144,53 +139,6 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         }
     }
 
-    protected final void DoubleClick(int button) {
-        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));
-    }
-
-    /** 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;
-        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 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;
-            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.putAndTriggerTraps("KeyPressed", key);
-            }
-            Platform.clipboardReadEnabled = false;
-        }
-    }
-
-    /** 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 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.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;
@@ -199,8 +147,12 @@ 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))
-            root.putAndTriggerTraps("Move", T);
-        root.Move(oldmousex, oldmousey, mousex, mousey);
+            try {
+                root.putAndTriggerTraps("_Move", T);
+            } catch (JSExn e) {
+                Log.info(Surface.class, "Exception thrown from Move message handler");
+                JS.log(e);
+            }
         if (!cursor.equals(oldcursor)) syncCursor();
     }
 
@@ -216,35 +168,33 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         Scheduler.add(this);
     }
 
-    // FEATURE: can we avoid creating objects here?
+    /** subclasses should invoke this method when the user resizes the window */
     protected final void SizeChange(final int width, final int height) {
-        Scheduler.add(new Scheduler.Task() { public void perform() {
-            root.set(root.REFLOW);
-            Surface.this.width = width;
-            Surface.this.height = height;
-        }});
+        if (pendingWidth == width && pendingHeight == height) return;
+        actualWidth = pendingWidth = width;
+        actualHeight = pendingHeight = height;
         abort = true;
+        Scheduler.renderAll();
     }
 
     // FEATURE: can we avoid creating objects here?
     protected final void PosChange(final int x, final int y) {
-        Scheduler.add(new Scheduler.Task() { public void perform() {
+        Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn {
             root.x = x;
             root.y = y;
             root.putAndTriggerTraps("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 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 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); }
@@ -254,11 +204,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);
         }
     }
@@ -278,6 +228,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
     public Surface(Box root) {
         this.root = root;
+        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();
@@ -289,18 +241,23 @@ 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() {
 
-        // 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(width, height);
-            setSize(width, height);
+            root.repack();
+            if (pendingWidth != -1) root.setMaxWidth(JS.N(pendingWidth));
+            if (pendingHeight != -1) root.setMaxHeight(JS.N(pendingHeight));
+            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);
             String oldcursor = cursor;
             cursor = "default";
-            root.Move(mousex, mousey, mousex, mousey);
+            root.putAndTriggerTrapsAndCatchExceptions("_Move", JS.T);
             if (!cursor.equals(oldcursor)) syncCursor();
         } while(abort);
 
@@ -315,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) {
 
@@ -327,8 +284,6 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                     if (dirt[j] != null)
                         dirtyRegions.dirty(dirt[j][0], dirt[j][1], dirt[j][2], dirt[j][3]);
 
-                // tail-recurse
-                render();
                 return;
             }
         }
@@ -348,7 +303,30 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
             Scheduler.add(this);
         }
         
-        public void perform() { boxContainingMouse.putAndTriggerTraps(name, value); }
+        public void perform() {
+            if (name.equals("_KeyPressed")) {
+                String value = (String)this.value;
+                if (value.toLowerCase().endsWith("shift")) shift = true;     else if (shift) value = value.toUpperCase();
+                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.info(Surface.class, "Exception thrown from "+name+" handler");
+                JS.log(e);
+            } finally {
+                Platform.clipboardReadEnabled = false;
+            }
+        }
         public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
 
     }
@@ -379,10 +357,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
 
         public void render() {
             super.render();
-            render_();
-        }
-
-        public void render_() {
+            if (abort) return;
             int[][] dirt = screenDirtyRegions.flush();
             for(int i = 0; dirt != null && i < dirt.length; i++) {
                 if (dirt[i] == null) continue;
@@ -395,6 +370,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 if (x+w > root.width) w = root.width - x;
                 if (y+h > root.height) h = root.height - y;
                 if (w <= 0 || h <= 0) continue;
+                if (abort) return;
                 blit(backbuffer, x, y, x, y, w + x, h + y);
             }
         }
@@ -402,7 +378,12 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
         /** This is how subclasses signal a 'shallow dirty', indicating that although the backbuffer is valid, the screen is not */
         public final void Dirty(int x, int y, int w, int h) {
             screenDirtyRegions.dirty(x, y, w, h);
-            Refresh();
+            Scheduler.renderAll();
+        }
+
+        public void dirty(int x, int y, int w, int h) {
+            screenDirtyRegions.dirty(x, y, w, h);
+            super.dirty(x, y, w, h);
         }
 
         /** copies a region from the doublebuffer to this surface */