propose-patch

[org.ibex.core.git] / src / org / xwt / Scheduler.java

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index 3dcc7f5..9e939a3 100644 (file)
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.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 java.util.*;
@@ -12,14 +12,35 @@ public class Scheduler {
 
     private static Scheduler singleton;
     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) (singleton = Platform.getScheduler()).run(); }
 
-    /** adds a task to the front of the queue (guaranteed to run next) */
-    public static void addAtFront(Task t) { singleton.runnable.prepend(t); }
+    private static Task current = null;
 
-    public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
+    private static volatile boolean rendering = false;
+    private static volatile boolean again = false;
+
+    /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
+    public static void renderAll() {
+        if (rendering) { again = true; return; }
+        synchronized(Scheduler.class) {
+            try {
+                rendering = true;
+                do {
+                    // FEATURE: this could be cleaner
+                    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 /////////////////////////////////////
 
@@ -38,17 +59,30 @@ 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);
+                // FIXME hideous
+                synchronized(this) {
+                    for(int i=0; i<Surface.allSurfaces.size(); i++) {
+                        Surface s = (Surface)Surface.allSurfaces.elementAt(i);
+                        if (current instanceof JS) {
+                            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, "a JavaScript thread spawned with xwt.thread() threw an exception:");
-                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, "a Task threw an exception which was caught by the scheduler:");
-                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
         }