X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FMain.java;h=39e23d2606d51dee1b01c762d6d3d6c9ccb2ed16;hp=0a4ff9107c684b50b764fec27c3e5104529ba669;hb=05d23fde131a7d19b378c632c6cc6b7924d8ab4d;hpb=a19b897271a8ab6b25aba63e4b30223c2477c28d

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index 0a4ff91..39e23d2 100644
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.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.core;
 
 import java.net.*;
@@ -12,6 +15,17 @@ import org.ibex.graphics.*;
 /** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
 
+    // ugly hack: we have to set these properties before AWT loads
+    static {
+        System.setProperty("apple.awt.showGrowBox", "false");
+        System.setProperty("apple.awt.graphics.EnableLazyDrawing", "40");
+        System.setProperty("apple.awt.graphics.EnableLazyDrawing", "true");
+        System.setProperty("apple.awt.window.position.forceSafeUserPositioning", "true");
+        System.setProperty("apple.awt.window.position.forceSafeCreation", "true");
+        System.setProperty("com.apple.hwaccel", "true");
+        System.setProperty("com.apple.forcehwaccel", "true");
+    }
+
     /**
      *  FEATURE: this should be implemented using self-emulation
      *  Used for security checks. If this is null, it means that only
@@ -25,7 +39,15 @@ public class Main {
     public static String origin = null;
     public static String initialTemplate = null;
     
-    public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
+    //public static final Fountain builtin = new Fountain.Zip(new Fountain.FromInputStream(Platform.getBuiltinInputStream()));
+    public static final Fountain vera;
+    static {
+        Fountain temp = null;
+        try {
+            temp = new Fountain.FromInputStream(Encode.JavaSourceCode.decode(Vera.data));
+        } catch (Exception e) { Log.error(Main.class, e); }
+        vera = temp;
+    }
 
     public static void printUsage() {
         System.err.println("Usage: ibex [-lawp] [ url | file | directory ]");
@@ -75,31 +97,44 @@ public class Main {
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
         origin = args[startargs];
 
-        Stream rr;
+        Fountain rr;
         final String startupTemplate;
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
             originHost = origin.substring(origin.indexOf('/') + 2);
             originHost = originHost.substring(0, originHost.indexOf('/') == -1 ? originHost.length() : originHost.indexOf('/'));
             if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
             originAddr = InetAddress.getByName(originHost);
-            rr = builtin;
-            startupTemplate = "org.ibex.builtin.splash";
+            //rr = builtin;
+            //startupTemplate = "org.ibex.builtin.splash";
+            rr = new Fountain.HTTP(origin);
+            startupTemplate = initialTemplate;
         } else {
-            rr = new Stream.File(origin);
-            if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
+            rr = new Fountain.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Fountain.Zip(rr);
             startupTemplate = initialTemplate;
         }
 
         if (Log.on) Log.info(Main.class, "loading xwar");
         final Ibex ibex = new Ibex(rr);
 
-        org.ibex.graphics.Surface.scarImage =
-            Picture.load(Main.builtin.get(JS.S("org/ibex/core/builtin/scar.png")),
-                         new Task() { public void perform() throws JSExn, UnknownHostException {
-                             if (Log.on) Log.info(Main.class, "invoking initial template");
-                             ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
-                         } });
+        try {
+            JS blessed = ibex.bless(new Fountain.FromInputStream(Encode.JavaSourceCode.decode(org.ibex.core.builtin.Scar.data)));
+            org.ibex.graphics.Surface.scarImage = Platform.createPicture(blessed);
+        } catch (Exception e) {
+            Log.error(Main.class, e);
+        }
 
-        Scheduler.init();
+        Platform.Scheduler.add(new Callable() {
+            private final JS[] callargs = new JS[1];
+            public Object run(Object o) throws JSExn,UnknownHostException {
+                if (Log.on) Log.info(Main.class, "invoking initial template");
+                try {
+                    callargs[0] = new Box(); 
+                    ibex.resolveString(startupTemplate, false).call(null, callargs);
+                } finally { callargs[0] = null; }
+                return null;
+            } });
+    
+        Platform.Scheduler.init();
     }
 }