X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FPlatform.java;h=e3e68e6a6addaa652f66335024a699a360204bbd;hb=0db1ff365b2acfa1be6420aca33a27dd01eb78f2;hp=5ad71c2fffab749b11de76a50581327748746562;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b;p=org.ibex.core.git

diff --git a/src/org/ibex/plat/Platform.java b/src/org/ibex/plat/Platform.java
index 5ad71c2..e3e68e6 100644
--- a/src/org/ibex/plat/Platform.java
+++ b/src/org/ibex/plat/Platform.java
@@ -1,4 +1,7 @@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.plat;
 
 import java.lang.reflect.*;
@@ -8,7 +11,7 @@ import org.ibex.js.*;
 import org.ibex.util.*;
 import org.ibex.graphics.*;
 import org.ibex.core.*;
-import org.ibex.graphics.*;
+import org.ibex.crypto.*;
 import org.ibex.core.*;
 import org.ibex.net.*;
 
@@ -48,7 +51,7 @@ public abstract class Platform {
             String os_name = System.getProperty("os.name", "");
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
-            
+
             if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else if (os_name.startsWith("Linux")) platform_class = "Linux";
@@ -57,8 +60,8 @@ public abstract class Platform {
                 else if (os_name.startsWith("Darwin")) platform_class = "Darwin";
                 else platform_class = "X11";
             }
+            else if (version.startsWith("1.4")) platform_class = "Java4";
             else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
-
             if (platform_class == null) {
                 Log.error(Platform.class, "Unable to detect JVM");
                 criticalAbort("Unable to detect JVM");
@@ -115,11 +118,11 @@ public abstract class Platform {
         ret.setInvisible(false);
         if (refreshable) {
             Surface.allSurfaces.addElement(ret);
-            ret.dirty(0, 0, b.width, b.height);
+            b.dirty();
             ret.Refresh();
         }
         try {
-            if (b.get("titlebar") != null) ret.setTitleBarText((String)b.get("titlebar"));
+            if (b.get(JSU.S("titlebar")) != null) ret.setTitleBarText(JSU.toString(b.get(JSU.S("titlebar"))));
         } catch (JSExn e) {
             Log.warn(Platform.class, e);
         }
@@ -257,6 +260,8 @@ public abstract class Platform {
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
+        // FIXME
+        /*
         Log.info(Platform.class, "attempting environment-variable DNS proxy detection");
         cachedProxyInfo = org.ibex.net.HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
@@ -264,7 +269,7 @@ public abstract class Platform {
         Log.info(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
         cachedProxyInfo = platform._detectProxy();
         if (cachedProxyInfo != null) return cachedProxyInfo;
-
+        */
         return cachedProxyInfo;
    } 
 
@@ -290,6 +295,141 @@ public abstract class Platform {
             return p;
         }
     }
+
+    /** Implements cooperative multitasking */
+    public static class Scheduler {
+
+    // Public API Exposed to org.ibex /////////////////////////////////////////////////
+
+    private static Scheduler singleton;
+    public static void add(Callable t) { Log.debug(Scheduler.class, "scheduling " + t); Scheduler.runnable.append(t); }
+    public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
+
+    private static Callable current = null;
+
+    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 /////////////////////////////////////
+
+        /**
+         *  SCHEDULER INVARIANT: all scheduler implementations MUST invoke
+         *  Surface.renderAll() after performing a Callable 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(); }
+        public Scheduler() { }
+
+
+        // Default Implementation //////////////////////////////////////////////////////
+
+        protected static Queue runnable = new Queue(50);
+        public void defaultRun() {
+            while(true) {
+                current = (Callable)runnable.remove(true);
+                try {
+                    // 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;
+                            }
+                        }
+                        Log.debug(Scheduler.class, "performing " + current);
+                        current.run(null);
+                    }
+                    renderAll();
+                } catch (JSExn e) {
+                    Log.info(Scheduler.class, "a JavaScript thread spawned with ibex.thread() threw an exception:");
+                    Log.info(Scheduler.class,e);
+                } catch (Exception e) {
+                    Log.info(Scheduler.class, "a Callable threw an exception which was caught by the scheduler:");
+                    Log.info(Scheduler.class, e);
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                }
+                // if an Error is thrown it will cause the engine to quit
+            }
+        }
+    }
+
+    /** Manages access to ~/.ibex */
+    public static class LocalStorage {
+
+        static String ibexDirName = System.getProperty("user.home") + java.io.File.separatorChar + ".ibex";
+
+        static java.io.File ibexDir = null;
+        static java.io.File cacheDir = null;
+
+        static {
+            try {
+                ibexDir = new java.io.File(ibexDirName);
+                if (!ibexDir.mkdirs()) ibexDir = null;
+                try {
+                    cacheDir = new java.io.File(ibexDirName + java.io.File.separatorChar + "cache");
+                    if (!cacheDir.mkdirs()) cacheDir = null;
+                } catch (Exception e) {
+                    Log.warn(LocalStorage.class, "unable to create cache directory " +
+                             ibexDirName + java.io.File.separatorChar + "cache");
+                }
+            } catch (Exception e) {
+                Log.warn(LocalStorage.class, "unable to create ibex directory " + ibexDirName);
+            }
+        }
+
+        // FEATURE: we ought to be able to do stuff like sha1-checking and date checking on cached resources    
+        public static class Cache {
+
+            private static void delTree(java.io.File f) throws IOException {
+                if (f.isDirectory()) {
+                    String[] s = f.list();
+                    for(int i=0; i<s.length; i++)
+                        delTree(new java.io.File(f.getPath() + java.io.File.separatorChar + s[i]));
+                }
+                f.delete();
+            }
+
+            public static void flush() throws IOException {
+                delTree(cacheDir);
+                cacheDir.mkdirs();
+            }
+
+            public static java.io.File getCacheFileForKey(String key) {
+                // FEATURE: be smarter here
+                return new java.io.File(cacheDir.getPath() + File.separatorChar + new String(Encode.toBase64(key.getBytes())));
+            }
+
+        }
+    }
+
 }