X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FSurface.java;h=e68c392463b5e8bd1a699e32d0c83ea97d05879d;hb=5de59cbabd2184a23380fee1bdf32e52c5bb44d7;hp=394f299b42148486b26925164710b0d8bdbd340d;hpb=fd6731e682bcf3801104fc3c35c808ba241b1739;p=org.ibex.core.git

diff --git a/src/org/ibex/Surface.java b/src/org/ibex/Surface.java
index 394f299..e68c392 100644
--- a/src/org/ibex/Surface.java
+++ b/src/org/ibex/Surface.java
@@ -132,8 +132,8 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 int oldmousex = mousex;     mousex = newmousex;
                 int oldmousey = mousey;     mousey = newmousey;
                 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))
+                // FIXME: Root (ONLY) gets motion events outside itself (if trapped)
+                if (oldmousex != mousex || oldmousey != mousey)
                     root.putAndTriggerTrapsAndCatchExceptions("_Move", T);
                 if (!cursor.equals(oldcursor)) syncCursor();
             } };
@@ -248,12 +248,12 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
                 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();
+            root.place_children();
             setSize(root.width, root.height);
-            String oldcursor = cursor;
+            /*String oldcursor = cursor;
             cursor = "default";
             root.putAndTriggerTrapsAndCatchExceptions("_Move", JS.T);
-            if (!cursor.equals(oldcursor)) syncCursor();
+            if (!cursor.equals(oldcursor)) syncCursor();*/
         } while(abort);
 
         int[][] dirt = dirtyRegions.flush();