X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FScheduler.java;h=55be6dfc3642658bb7ca98a7a7d209fe3b84ba05;hb=97daadb9ac5a453889da76c8c4c72f8f6badcba2;hp=3dcc7f54701913e02518db7c830a93565aac1e44;hpb=78c49c04f5b4718f99b1283a9b685e0785629928;p=org.ibex.core.git

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index 3dcc7f5..55be6df 100644
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -8,6 +8,8 @@ import org.xwt.util.*;
 /** Implements cooperative multitasking */
 public class Scheduler {
 
+    // FIXME: prepending events messes with keysate -- make a "no re-ordering" invariant?
+
     // Public API Exposed to org.xwt /////////////////////////////////////////////////
 
     private static Scheduler singleton;
@@ -21,6 +23,9 @@ public class Scheduler {
 
     public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
 
+    private static Task current = null;
+    public static Task current() { return current; }
+
     // API which must be supported by subclasses /////////////////////////////////////
 
     /**
@@ -38,11 +43,20 @@ public class Scheduler {
     protected static Queue runnable = new Queue(50);
     public void defaultRun() {
         while(true) {
-            Task t = (Task)runnable.remove(true);
+            current = (Task)runnable.remove(true);
             try {
-                t.perform();
-                // FEATURE: be smarter about this
-                if (t != Surface.renderAll) add(Surface.renderAll);
+                for(int i=0; i<Surface.allSurfaces.size(); i++) {
+                    Surface s = (Surface)Surface.allSurfaces.elementAt(i);
+                    if (current instanceof JSFunction) {
+                        s._mousex = Integer.MAX_VALUE;
+                        s._mousey = Integer.MAX_VALUE;
+                    } else {
+                        s._mousex = s.mousex;
+                        s._mousey = s.mousey;
+                    }
+                }
+                current.perform();
+                if (runnable.size() == 0 && Surface.needRender) Surface.renderAll.perform();
             } catch (JSExn e) {
                 Log.log(Scheduler.class, "a JavaScript thread spawned with xwt.thread() threw an exception:");
                 Log.log(Scheduler.class, e.toString());