X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=30b46e1d402af0e393e20ffd72ee8dc71bbfe278;hb=38786988d12f2c48a314ee37c326965ff0bcadb6;hp=cbae0957c4448f57a24ebda02a43b30cff1ad96b;hpb=c55a2217bcedf009ad6db9cbaddbcc28b6bda06d;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index cbae095..30b46e1 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -1,4 +1,4 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.lang.reflect.*;
@@ -34,7 +34,7 @@ public class Platform {
     static boolean alreadyDetectedProxy = false;
 
     /** the result of proxy autodetection */
-    static Proxy cachedProxyInfo = null;
+    static HTTP.Proxy cachedProxyInfo = null;
 
     /** the current build */
     public static String build = "unknown";
@@ -49,7 +49,7 @@ public class Platform {
     // reflection.
 
     static {
-        System.out.println("Detecting JVM...");
+        System.err.println("Detecting JVM...");
         try {
             String vendor = System.getProperty("java.vendor", "");
             String version = System.getProperty("java.version", "");
@@ -57,17 +57,18 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            //if (os_name.startsWith("Mac OS X")) platform_class = "MacOSX";
-            if (vendor.startsWith("Free Software Foundation")) {
+            if (os_name.startsWith("Darwin")) platform_class = "Darwin";
+            else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
-                else platform_class = "POSIX";
+                else platform_class = "X11";
             } else if (version.startsWith("1.1") && vendor.startsWith("Netscape")) platform_class = "Netscape";
             else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
-            else if (version.startsWith("1.4")) platform_class = "Java14";
-            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12";
+            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
 
+            /*
         // Disable 2d hardware acceleration on Jaguar
         if (os_name.equals("Mac OS X") && os_version.equals("10.2"))
+            */
         System.setProperty("com.apple.hwaccel", "false");
 
             if (platform_class != null) {
@@ -87,7 +88,6 @@ public class Platform {
             if (Log.on) Log.log(Platform.class, "XWT VM detection:   vendor = " + vendor);
             if (Log.on) Log.log(Platform.class, "                   version = " + version);
             if (Log.on) Log.log(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
-            if (Log.on && Main.applet != null) Log.log(Platform.class, "                   browser = " + Main.applet.getParameter("browser"));
 
             if (platform_class == null) {
                 if (Log.on) Log.log(Platform.class, "Unable to detect JVM");
@@ -116,10 +116,10 @@ public class Platform {
     protected void init() { }
     protected void postInit() { }
 
-    /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt>; we need to associate DoubleBuffers to surfaces
+    /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt>; we need to associate PixelBuffers to surfaces
      *  due to AWT 1.1 requirements (definately for Navigator, possibly also for MSJVM).
      */
-    protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return null; }
+    protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return null; }
     
     /** creates and returns a new surface */
     protected Surface _createSurface(Box b, boolean framed) { return null; }
@@ -176,17 +176,12 @@ public class Platform {
                 public Object get() { return o; }
             };
     }
+
+        /** Called once XWT is initialized and the application is running. */
+        protected void _running() {}
     
     /** quits XWT */
-    protected void _exit() {
-        if (Main.applet == null) {
-            System.exit(0);
-        } else {
-            // just block ourselves forever
-            // FIXME
-            new Semaphore().block();
-        }
-    }
+    protected void _exit() { System.exit(0); }
 
     /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
     protected void _criticalAbort(String message) { _exit(); }
@@ -206,7 +201,7 @@ public class Platform {
     }
 
     /** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
-    protected synchronized Proxy _detectProxy() { return null; }
+    protected synchronized HTTP.Proxy _detectProxy() { return null; }
 
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
@@ -214,6 +209,11 @@ public class Platform {
     /** returns true iff the platform has a case-sensitive filesystem */
     protected boolean _isCaseSensitive() { return true; }
 
+    /** returns an InputStream to the builtin xwar */
+    protected InputStream _getBuiltinInputStream() {
+        return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.jar");
+    }
+
     /** returns the value of the environment variable key, or null if no such key exists */
     protected String _getEnv(String key) {
         try {
@@ -242,6 +242,10 @@ public class Platform {
         return null;
     }
 
+    /** convert a JPEG into an Image */
+    protected ImageDecoder _decodeJPEG(InputStream is, String name) { return null; }
+
+
     // Static methods -- thunk to the instance /////////////////////////////////////////////////////////////////////////
 
     /** if true, org.xwt.Surface should generate Click messages automatically when a Release happens after a Press and the mouse has not moved much */
@@ -295,11 +299,14 @@ public class Platform {
     public static int getScreenHeight() { return platform._getScreenHeight(); }
 
     /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt> */
-    public static DoubleBuffer createDoubleBuffer(int w, int h, Surface s) { return platform._createDoubleBuffer(w, h, s); }
+    public static PixelBuffer createPixelBuffer(int w, int h, Surface s) { return platform._createPixelBuffer(w, h, s); }
 
     /** creates and returns a picture */
     public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
 
+    /** returns an InputStream to the builtin xwar */
+    public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
+        
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -340,6 +347,12 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
+        /** Called once XWT is initialized and the application is running. */
+        public static void running() {
+                Log.log(Platform.class, "XWT is running");
+                platform._running();
+        }
+        
     /** quits XWT */
     public static void exit() {
         Log.log(Platform.class, "exiting via Platform.exit()");
@@ -359,40 +372,40 @@ public class Platform {
     /** this method invokes the platform _createSurface() method and then enforces a few post-call invariants */
     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
-        ret.setInvisible(b.invisible);
-        b.set(Box.size, 0, b.size(0) < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.size(0));
-        b.set(Box.size, 1, b.size(1) < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.size(1));
+        b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width;
+        b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height;
+        ret.setInvisible(false);
 
-        Object titlebar = b.get("titlebar", null, true);
+        Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
-        Object icon = b.get("icon", null, true);
+        Object icon = b.get("icon", true);
         if (icon != null && !"".equals(icon)) {
-            Picture pic = Box.getPicture(icon.toString());
+            Picture pic = ImageDecoder.getPicture(icon.toString());
             if (pic != null) ret.setIcon(pic);
             else if (Log.on) Log.log(Platform.class, "unable to load icon " + icon);
         }
 
-        ret.setLimits(b.dmin(0), b.dmin(1), b.dmax(0), b.dmax(1));
+        ret.setLimits(b.minwidth, b.minheight, b.maxwidth, b.maxheight);
 
         if (refreshable) {
             Surface.refreshableSurfaceWasCreated = true;
             Surface.allSurfaces.addElement(ret);
-            ret.dirty(0, 0, ret.width, ret.height);
+            ret.dirty(0, 0, b.width, b.height);
             ret.Refresh();
         }
         return ret;
     }
 
     /** detects proxy settings */
-    public static synchronized Proxy detectProxy() {
+    public static synchronized HTTP.Proxy detectProxy() {
 
         if (cachedProxyInfo != null) return cachedProxyInfo;
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
         if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
-        cachedProxyInfo = Proxy.detectProxyViaManual();
+        cachedProxyInfo = HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
@@ -402,6 +415,10 @@ public class Platform {
         return cachedProxyInfo;
     }
 
+    public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
+        return platform._decodeJPEG(is, name);
+    }
+
     // Helpful font parsing stuff //////////////////////////////////////////////////////
 
     public static class ParsedFont {