X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;h=3c79fd8860e905bc4087204f0cfabe4e57870df3;hb=6a96430e10e27fc1de5754cb5add705f929dd109;hp=902cb92f068946fa8bd3918348ad3e29725c3519;hpb=73a633c6b568a6b90457199718f22b26b91f441d;p=org.ibex.core.git

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 902cb92..3c79fd8 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -24,8 +24,9 @@ public class Main {
     public static java.net.InetAddress originAddr = null;
     public static String originHost = null;
     public static String origin = null;
-
-    public static Res builtin = null;
+    
+    public static final Res builtin = new Res.Zip(new Res.Builtin());
+    public static Picture scarImage = null;
 
     public static void printUsage() {
         System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
@@ -60,38 +61,46 @@ public class Main {
         Platform.forceLoad();
         if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
 
-        builtin = new Res.Zip(new Res.IS(Platform.getBuiltinInputStream()));
-
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
         initialTemplateName = initialTemplateName.replace('/', '.');
         origin = args[startargs];
 
+        Res rr;
+        final String initialTemplate;
+
         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;
+            initialTemplate = "org/xwt/builtin/splash.xwt";
         } else {
             // HACK because MSIE turns \'s into /'s in file URLs... argh!!
             if (Platform.platform.getClass().getName().endsWith("Win32")) origin = origin.replace('/', '\\');
-            if (!new File(origin).isDirectory()) origin += "!";
-            origin = "file:" + origin;
+            final String final_origin = origin;
+            rr = new Res.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Res.Zip(rr);
+            initialTemplate = initialTemplateName;
         }
 
-        // FIXME put the splash screen back in
         if (Log.on) Log.log(Main.class, "loading xwar");
-
-        final Res rr = Res.stringToRes(origin, true);
         final XWT xwt = new XWT(rr);
-        final String initialTemplateName_ = initialTemplateName;
+        final Res final_rr = rr;
+
+        Picture.fromRes((Res)Main.builtin.get("org/xwt/builtin/scar.png"), new Callback() {
+                public Object call(Object arg) {
+                    scarImage = (Picture)arg;
+                    Scheduler.add(new Scheduler.Task() {
+                            public Object call(Object args) {
+                                Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), null, xwt);
+                                return null;
+                            }
+                        });
+                    return null;
+                } });
 
-        new Thread(new Runnable() { 
-            public void run() {
-                Template.getTemplate(((Res)rr.get(initialTemplateName_)).addExtension(".xwt")).apply(new Box(), null, xwt);
-                Message.Q.startQ();
-            }
-        }).start();
-        
+        new Thread() { public void run() { Scheduler.run(); } }.start();
         Platform.running();
     }