X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSurface.java;h=962a426b7acb768559fd08fcc323387aafadd794;hb=e58686eae8a823ed64ed0ec92c2274c41d90ec93;hp=167a5f48120384cde15864c64ab52aedec58c6e3;hpb=6231a0535e90ed18d4509c24d9de88fe6586b289;p=org.ibex.core.git

diff --git a/src/org/xwt/Surface.java b/src/org/xwt/Surface.java
index 167a5f4..962a426 100644
--- a/src/org/xwt/Surface.java
+++ b/src/org/xwt/Surface.java
@@ -54,9 +54,6 @@ public abstract class Surface {
 
     // Public Members and State Variables /////////////////////////////////////////////////////////
 
-    /** this is the box on this surface which the mouse was inside at the time that the currently-executing event was enqueued */
-    public Box boxContainingMouse = null;
-
     /** false if the surface has never been rendered; used to determine if the surface should be repositioned to be centered on the screen */
     public boolean centerSurfaceOnRender = true;
 
@@ -159,9 +156,8 @@ public abstract class Surface {
         else if (button == 3) {
             final Box who = root.whoIs(mousex, mousey);
             MessageQueue.add(new Message() { public void perform() {
-                Surface.this.boxContainingMouse = who;
                 Platform.clipboardReadEnabled = true;
-                root.put("Press3", null, Boolean.TRUE);
+                root.put("Press3", Boolean.TRUE);
                 Platform.clipboardReadEnabled = false;
             }});
         }
@@ -226,7 +222,7 @@ public abstract class Surface {
                 Box b = (Box)keywatchers.elementAt(i);
                 for(Box cur = b; cur != null; cur = cur.getParent())
                     if (cur.invisible) continue outer;
-                b.put("KeyPressed", null, key);
+                b.put("KeyPressed", key);
             }
             Platform.clipboardReadEnabled = false;
         }
@@ -243,7 +239,7 @@ public abstract class Surface {
                 Box b = (Box)keywatchers.elementAt(i);
                 for(Box cur = b; cur != null; cur = cur.getParent())
                     if (cur.invisible) continue outer;
-                b.put("KeyReleased", null, key);
+                b.put("KeyReleased", key);
             }
         }});
     }
@@ -271,7 +267,7 @@ public abstract class Surface {
 
                 // Root gets motion events outside itself (if trapped, of course)
                 if (root.is_trapped("Move") && !root.inside(oldmousex, oldmousey) && !root.inside(mousex, mousey) && (button1 || button2 || button3))
-                    root.put("Move", null, Boolean.TRUE);
+                    root.put("Move", Boolean.TRUE);
 
                 root.Move(oldmousex, oldmousey, mousex, mousey);
                 if (!cursor.equals(oldcursor)) syncCursor();
@@ -292,13 +288,13 @@ public abstract class Surface {
     protected final void PosChange(int x, int y) {
         root.set(Box.abs, 0, x);
         root.set(Box.abs, 1, y);
-        new SimpleMessage("PosChange", Boolean.TRUE, null);
+        new SimpleMessage("PosChange", Boolean.TRUE, root);
     }
 
-    protected final void Close() { new SimpleMessage("Close", Boolean.TRUE, null); }
-    protected final void Minimized(boolean b) { minimized = b; new SimpleMessage("Minimized", b ? Boolean.TRUE : Boolean.FALSE, null); }
-    protected final void Maximized(boolean b) { maximized = b; new SimpleMessage("Maximized", b ? Boolean.TRUE : Boolean.FALSE, null); }
-    protected final void Focused(boolean b) { new SimpleMessage("Focused", b ? Boolean.TRUE : Boolean.FALSE, null); }
+    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() { MessageQueue.refresh(); }
 
     // the following value is split into two int's to work around GCJ bug java/6393
@@ -433,11 +429,11 @@ public abstract class Surface {
                                scarPicture.getWidth(), scarPicture.getHeight());
 
             // sort of ugly; we can't use set() here because it will cause an infinite mutual recursion
-            root._size_0 = (short)width;
-            root._size_1 = (short)height;
+            root._size_0 = (int)width;
+            root._size_1 = (int)height;
 
             root.mark_for_prerender();
-            root.put("SizeChange", null, Boolean.TRUE);
+            root.put("SizeChange", Boolean.TRUE);
         }
 
         while (root.needs_prerender || abort) {
@@ -589,14 +585,8 @@ public abstract class Surface {
             MessageQueue.add(this);
         }
         
-        public void perform() {
-            Surface.this.boxContainingMouse = this.boxContainingMouse;
-            root.put(name, root, value);
-        }
-
-        public String toString() {
-            return "SimpleMessage [name=" + name + ", value=" + value + "]";
-        }
+        public void perform() { boxContainingMouse.put(name, value); }
+        public String toString() { return "SimpleMessage [name=" + name + ", value=" + value + "]"; }
         
     }