X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;h=533e763c92677b1f5205f5cb912024237ee31369;hp=b725805293246029bf6225d8d496e8ba4713e0fa;hb=8ad8837b741bd77cd8aeef1881159ad839ce3828;hpb=7f5df8070a5551fe66abd11a589677e285ca62f8

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index b725805..533e763 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -1,18 +1,22 @@
-// 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.*;
 import java.util.*;
 import java.io.*;
 import java.awt.*;
-import org.bouncycastle.util.encoders.Base64;
 import org.xwt.js.*;
 import org.xwt.util.*;
 import org.xwt.translators.*;
+import org.xwt.plat.*;
+import org.bouncycastle.util.encoders.Base64;
 
 /** Entry point for the XWT Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
 
+    // to prevent GCJ from dropping these classes
+    private static final Class[] keep = new Class[] { GCJ.class, Linux.class, Solaris.class, Darwin.class, Win32.class };
+
     /**
      *  FEATURE: this should be implemented using self-emulation
      *  Used for security checks. If this is null, it means that only
@@ -24,8 +28,9 @@ public class Main {
     public static java.net.InetAddress originAddr = null;
     public static String originHost = null;
     public static String origin = null;
+    public static String initialTemplate = null;
     
-    public static final Res builtin = new Res.Zip(new Res.Builtin());
+    public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
     public static Picture scarImage = null;
 
     public static void printUsage() {
@@ -33,17 +38,18 @@ public class Main {
         System.err.println("");
         System.err.println("Options:");
         System.err.println("    -v verbose logging");
+        System.err.println("    -s [not yet supported]");
+        System.err.println("    -l [not yet supported]");
         System.err.println("");
         System.err.println("Source-location is one of the following:");
         System.err.println("    - the path to an xwar file");
         System.err.println("    - the path to a directory to be used as an xwar");
         System.err.println("    - the http url of an xwar");
         System.err.println("");
-        System.err.println("Initial-template is the resource name of the template to load; defaults to 'main'");
+        System.err.println("Initial-template is the path of the template to load; defaults to 'main'");
         Runtime.getRuntime().exit(-1);
     }
 
-    /** common entry point */
     public static void main(String[] args) throws Exception {
         int startargs = 0;
         while (true) {
@@ -54,41 +60,36 @@ public class Main {
         }
 
         Platform.forceLoad();
-        if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
+        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('.', '/');
+        initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
         origin = args[startargs];
 
-        Res rr;
-        final String initialTemplate;
-
+        Stream 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;
-            initialTemplate = "org/xwt/builtin/splash.xwt";
+            startupTemplate = "org.xwt.builtin.splash";
         } else {
-            rr = new Res.File(origin);
-            if (!new File(origin).isDirectory()) rr = new Res.Zip(rr);
-            initialTemplate = initialTemplateName;
+            rr = new Stream.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
+            startupTemplate = initialTemplate;
         }
 
-        if (Log.on) Log.log(Main.class, "loading xwar");
+        if (Log.on) Log.info(Main.class, "loading xwar");
         final XWT xwt = new XWT(rr);
-        final Res final_rr = rr;
+        final JS final_rr = (JS)xwt.get("");
 
-        scarHolder =
-            Picture.fromRes((Res)Main.builtin.get("org/xwt/builtin/scar.png"),
-                        new Scheduler.Task() { public void perform() {
-                            scarImage = scarHolder.picture;
-                            Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new BoxTree(), xwt);
-                        } });
+        scarImage =
+            Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
+                         new Scheduler.Task() { public void perform() throws Exception {
+                             xwt.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
+                         } });
 
-        new Thread() { public void run() { Scheduler.init(); } }.start();
-        Platform.running();
+        Scheduler.init();
     }
-    static Picture.Holder scarHolder = null;
 }