X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;h=b9967e852339f83ca97bd82f82d880b7dad36660;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;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..b9967e8 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.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.net.*;
@@ -24,18 +24,15 @@ 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 Stream builtin = new Stream.Zip(new Stream.Builtin());
+    public static Picture scarImage = null;
 
     public static void printUsage() {
         System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
         System.err.println("");
         System.err.println("Options:");
-        // FEATURE: reintroduce
-        //System.err.println("    -s show rendering activity with red rectangles");
         System.err.println("    -v verbose logging");
-        // FEATURE: reintroduce
-        //System.err.println("    -l serve logs via HTTP on 127.0.0.1:<port>/<url>");
         System.err.println("");
         System.err.println("Source-location is one of the following:");
         System.err.println("    - the path to an xwar file");
@@ -46,53 +43,48 @@ public class Main {
         Runtime.getRuntime().exit(-1);
     }
 
-    /** common entry point */
     public static void main(String[] args) throws Exception {
         int startargs = 0;
         while (true) {
             if (startargs > args.length - 1) printUsage();
             else if (args[startargs].equals("-v")) Log.verbose = true;
-            else if (args[startargs].equals("-l")) startargs++;
             else break;
             startargs++;
         }
 
         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()));
+        if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
-        initialTemplateName = initialTemplateName.replace('/', '.');
+        initialTemplateName = initialTemplateName.replace('.', '/');
         origin = args[startargs];
 
+        Stream 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;
+            rr = new Stream.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Stream.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);
+        if (Log.on) Log.info(Main.class, "loading xwar");
         final XWT xwt = new XWT(rr);
-        final String initialTemplateName_ = initialTemplateName;
+        final Stream final_rr = rr;
 
-        new Thread(new Runnable() { 
-            public void run() {
-                Template.getTemplate(((Res)rr.get(initialTemplateName_)).addExtension(".xwt")).apply(new Box(), null, xwt);
-                Message.Q.startQ();
-            }
-        }).start();
-        
-        Platform.running();
-    }
+        scarImage =
+            Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
+                         new Scheduler.Task() { public void perform() throws JSExn {
+                             Template.getTemplate(((Stream)final_rr.get(initialTemplate))).apply(new Box(), xwt);
+                         } });
 
+        Scheduler.init();
+    }
 }