X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FScheduler.java;h=5439bf917d9a37401698400f0ce2936a772e73f2;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=cecdee8f9c345828448c5a96517b1b7e661d4665;hpb=2d8e96e82e4c281dd2914fd544b274339fd356d1;p=org.ibex.core.git

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index cecdee8..5439bf9 100644
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -8,23 +8,54 @@ 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;
-    public static abstract class Task { public abstract void perform(); }
+    public static interface Task { public abstract void perform() throws Exception; }
+
+    /** adds a task to the back of the queue */
     public static void add(Task t) { singleton.runnable.append(t); }
-    public static void init() {
-        if (singleton != null) return;
-        singleton = Platform.getScheduler();
-        singleton.run();
+
+    /** adds a task to the front of the queue (guaranteed to run next) */
+    public static void addAtFront(Task t) { singleton.runnable.prepend(t); }
+
+    public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
+
+    private static Task current = null;
+    public static Task current() { return current; }
+
+    /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
+    private static volatile boolean rendering = false;
+    private static volatile boolean again = false;
+    public static void renderAll() {
+        if (rendering) { again = true; return; }
+        synchronized(Scheduler.class) {
+            try {
+                rendering = true;
+                do {
+                    again = false;
+                    for(int i=0; i<Surface.allSurfaces.size(); i++) {
+                        Surface s = ((Surface)Surface.allSurfaces.elementAt(i));
+                        do { s.render(); } while(s.abort);
+                    }
+                } while(again);
+            } finally {
+                rendering = false;
+            }
+        }
     }
 
+    
 
     // API which must be supported by subclasses /////////////////////////////////////
 
     /**
-     *  INVARIANT: all scheduler implementations MUST invoke Surface.renderAll() after performing a Task if no tasks remain
-     *  in the queue.  A scheduler may choose to invoke Surface.renderAll() more often than that if it so chooses.
+     *  SCHEDULER INVARIANT: all scheduler implementations MUST invoke
+     *  Surface.renderAll() after performing a Task if no tasks remain
+     *  in the queue.  A scheduler may choose to invoke
+     *  Surface.renderAll() more often than that if it so chooses.
      */
     public void run() { defaultRun(); }
     protected Scheduler() { }
@@ -35,16 +66,31 @@ 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
-                Surface.renderAll();
+                synchronized(this) {
+                    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();
+                }
+                renderAll();
             } catch (JSExn e) {
-                Log.log(Scheduler.class, e.toString());
+                Log.info(Scheduler.class, "a JavaScript thread spawned with xwt.thread() threw an exception:");
+                Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
+                Log.info(Scheduler.class,e);
             } catch (Exception e) {
-                Log.log(Scheduler.class, e);
+                Log.info(Scheduler.class, "a Task threw an exception which was caught by the scheduler:");
+                Log.info(Scheduler.class, e);
             }
+            // if an Error is thrown it will cause the engine to quit
         }
     }
 }