X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=aa8be357dc75679e5ea0ae40728fd7fedef69227;hb=745fb6aad79e10eb8c402b8fa6a591769c0fcdfb;hp=02e75dd4fb8eddf7d26661811edf4feb0d47d566;hpb=76a3f525433eff7ade457945efa42aa5c1a50b84;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 02e75dd..aa8be35 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,10 @@ public class Platform {
     static boolean alreadyDetectedProxy = false;
 
     /** the result of proxy autodetection */
-    static HTTP.ProxyInfo cachedProxyInfo = null;
+    static HTTP.Proxy cachedProxyInfo = null;
+
+    /** the current build */
+    public static String build = "unknown";
 
     // VM Detection Logic /////////////////////////////////////////////////////////////////////
 
@@ -46,43 +49,59 @@ 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", "");
             String os_name = System.getProperty("os.name", "");
+            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) {
                 platform = (Platform)Class.forName("org.xwt.plat." + platform_class).newInstance();
                 platform.init();
             }
 
+            try {
+                build = (String)Class.forName("org.xwt.Build").getField("build").get(null);
+            } catch (ClassNotFoundException cnfe) {
+            } catch (Exception e) {
+                if (Log.on) Log.log(Platform.class, "exception while detecting build:");
+                if (Log.on) Log.log(Platform.class, e);
+            }
+            if (Log.on) Log.log(Platform.class, "XWT build: " + build);
+
             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);
+            if (Log.on) Log.log(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
 
             if (platform_class == null) {
                 if (Log.on) Log.log(Platform.class, "Unable to detect JVM");
-                System.exit(-1);
+                new Platform().criticalAbort("Unable to detect JVM");
             }
 
             if (Log.on) Log.log(Platform.class, "                  platform = " + platform.getDescriptiveName());
             if (Log.on) Log.log(Platform.class, "                     class = " + platform.getClass().getName());
+            platform.postInit();
 
         } catch (Exception e) {
             if (Log.on) Log.log(Platform.class, "Exception while trying to detect JVM");
             if (Log.on) Log.log(Platform.class, e);
-            System.exit(-1);
+            new Platform().criticalAbort("Unable to detect JVM");
         }
 
     }
@@ -95,161 +114,119 @@ public class Platform {
 
     /** this initializes the platform; code in here can invoke methods on Platform since Platform.platform has already been set */
     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; }
+    public static PixelBuffer createPixelBuffer(int w, int h, Surface s) { return platform._createPixelBuffer(w, h, s); }
+    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; }
+    /** creates and returns a picture */
+    public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
+    public static Picture createAlphaOnlyPicture(byte[] data, int w, int h) { return platform._createAlphaOnlyPicture(data, w, h); }
+    
+    protected Picture _createPicture(int[] b, int w, int h) { return null; }
+    protected Picture _createAlphaOnlyPicture(byte[] b, int w, int h) {
+        int[] b2 = new int[b.length];
+        for(int i=0;i<b.length;i++) b2[i] = (b[i]&0xff) << 24;
+        return _createPicture(b2,w,h);
+    }
 
     /** creates a socket object */
+    public static Socket getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException {
+        return platform._getSocket(host, port, ssl, negotiate);
+    }
     protected Socket _getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException {
-        return ssl ? new TinySSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
+        Socket ret = ssl ? new TinySSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
+        ret.setTcpNoDelay(true);
+        return ret;
     }
-
-    /** creates and returns a picture */
-    protected Picture _createPicture(int[] b, int w, int h) { return null; }
     
     /** should return true if it is safe to supress full-surface dirties immediately after a window resize */
+    public static boolean supressDirtyOnResize() { return platform._supressDirtyOnResize(); }
     protected boolean _supressDirtyOnResize() { return false; }
 
     /** the human-readable name of the key mapped to XWT's 'alt' key */
+    public static String altKeyName() { return platform._altKeyName(); }
     protected String _altKeyName() { return "alt"; }
 
-    /** opens a connection to the resource identified by URL u, and returns an InputStream */
-    protected InputStream _urlToInputStream(URL u) throws IOException { return u.openStream(); }
-
     /** returns the contents of the clipboard */    
+    public static Object getClipBoard() { return clipboardReadEnabled ? platform._getClipBoard() : null; }
     protected String _getClipBoard() { return null; }
 
     /** sets the contents of the clipboard */
+    public static void setClipBoard(String s) { platform._setClipBoard(s); }
     protected void _setClipBoard(String s) { }
 
     /** returns the width of the screen, in pixels */
+    public static int getScreenWidth() { return platform._getScreenWidth(); }
     protected int _getScreenWidth() { return 640; }
 
     /** returns the height of the screen, in pixels */
+    public static int getScreenHeight() { return platform._getScreenHeight(); }
     protected int _getScreenHeight() { return 480; }
 
-    /** returns the width of a string in a platform-specific font */
-    protected int _stringWidth(String font, String text) { return 10 * text.length(); }
-
-    /** returns the maximum ascent of all glyphs in a given platform-specific font */
-    protected int _getMaxAscent(String font) { return 10; }
-
-    /** returns the maximum descent of all glyphs in a given platform-specific font */
-    protected int _getMaxDescent(String font) { return 2; }
-
-    /** returns a list of all platform-specific fonts available */
-    protected String[] _listFonts() { return new String[] { }; }
-
     /** returns the maximum number of threads that the XWT engine can create without adversely affecting the host OS */
+    public static int maxThreads() { return platform._maxThreads(); }
     protected int _maxThreads() { return 25; }
 
-    /** creates a weak reference */
-    protected org.xwt.Weak _getWeak(final Object o) {
-        return new org.xwt.Weak() {
-                public Object get() { return o; }
-            };
-    }
-    
-    /** quits XWT */
-    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) { System.exit(-1); }
 
-    /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
-    protected String _getDefaultFont() { return "sansserif10"; }
-
     /** if true, org.xwt.Surface will generate a Click automatically after a press and a release */
+    public static boolean needsAutoClick() { return platform._needsAutoClick(); }
     protected boolean _needsAutoClick() { return false; }
 
     /** if true, org.xwt.Surface will generate a DoubleClick automatically after recieving two clicks in a short period of time */
+    public static boolean needsAutoDoubleClick() { return platform._needsAutoDoubleClick(); }
     protected boolean _needsAutoDoubleClick() { return false; }
 
-    protected void _newBrowserWindow(String url) {
-        if (Log.on) Log.log(this, "Platform " + platform.getClass().getName() + " cannot open browser windows");
-        return;
-    }
-
-    /** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
-    protected synchronized HTTP.ProxyInfo _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; }
-
     /** returns true iff the platform has a case-sensitive filesystem */
+    public static boolean isCaseSensitive() { return platform._isCaseSensitive(); }
     protected boolean _isCaseSensitive() { return true; }
 
-
-    // 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 */
-    public static boolean needsAutoClick() { return platform._needsAutoClick(); }
-
-    /** if true, org.xwt.Surface should generate DoubleClick messages automatically when needed */
-    public static boolean needsAutoDoubleClick() { return platform._needsAutoDoubleClick(); }
-
-    /** should return true if it is safe to supress full-surface dirties immediately after a window resize */
-    public static String getDefaultFont() { return platform._getDefaultFont(); }
-
-    /** should return true if it is safe to supress full-surface dirties immediately after a window resize */
-    public static boolean supressDirtyOnResize() { return platform._supressDirtyOnResize(); }
-
-    /** returns the width of a string in a platform-specific font */
-    public static int stringWidth(String font, String text) { return platform._stringWidth(font, text); }
-
-    /** returns the maximum ascent of all glyphs in a given platform-specific font */
-    public static int getMaxAscent(String font) { return platform._getMaxAscent(font); }
-
-    /** returns the maximum descent of all glyphs in a given platform-specific font. Three pixel minimum ensures space for underline. */
-    public static int getMaxDescent(String font) { return Math.max(3, platform._getMaxDescent(font)); }
-
-    /** returns the maximum number of threads that the XWT engine can create without adversely affecting the host OS */
-    public static int maxThreads() { return platform._maxThreads(); }
-
-    /** returns a list of all platform-specific fonts available */
-    public static String[] listFonts() { return platform._listFonts(); }
-
-    /** creates a weak reference */
-    public static org.xwt.Weak getWeak(Object o) { return platform._getWeak(o); }
-
-    /** opens a connection to the resource identified by URL u, and returns an InputStream */
-    public static InputStream urlToInputStream(URL u) throws IOException { return platform._urlToInputStream(u); }
-
-    /** returns the contents of the clipboard */    
-    public static Object getClipBoard() { return clipboardReadEnabled ? platform._getClipBoard() : null; }
-
-    /** sets the contents of the clipboard */
-    public static void setClipBoard(String s) { platform._setClipBoard(s); }
-
-    /** creates a socket object, with or without ssl encryption */
-    public static Socket getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException {
-        return platform._getSocket(host, port, ssl, negotiate);
+    /** returns an InputStream to the builtin xwar */
+    public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
+    protected InputStream _getBuiltinInputStream() {
+        return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.jar");
     }
 
-    /** returns the width of the screen, in pixels */
-    public static int getScreenWidth() { return platform._getScreenWidth(); }
-
-    /** returns the height of the screen, in pixels */
-    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); }
-
-    /** creates and returns a picture */
-    public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
+    /** returns the value of the environment variable key, or null if no such key exists */
+    public static String getEnv(String key) { return platform._getEnv(key); }
+    protected String _getEnv(String key) {
+        try {
+            String os = System.getProperty("os.name").toLowerCase();
+            Process p;
+            if (os.indexOf("windows 9") != -1 || os.indexOf("windows me") != -1) {
+                // hack -- jdk1.2/1.3 on Win32 pop open an ugly DOS box; 1.4 does not
+                if (platform.getClass().getName().endsWith("Java12")) return null;
+                p = Runtime.getRuntime().exec("command.com /c set");
+            } else if (os.indexOf("windows") > -1) {
+                // hack -- jdk1.2/1.3 on Win32 pop open an ugly DOS box; 1.4 does not
+                if (platform.getClass().getName().endsWith("Java12")) return null;
+                p = Runtime.getRuntime().exec("cmd.exe /c set");
+            } else {  
+                p = Runtime.getRuntime().exec("env");
+            }
+            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String s;
+            while ((s = br.readLine()) != null)
+                if (s.startsWith(key + "="))
+                    return s.substring(key.length() + 1);
+        } catch (Exception e) {
+            if (Log.on) Log.log(this, "Exception while reading from environment:");
+            if (Log.on) Log.log(this, e);
+        }
+        return null;
+    }
 
-    /** creates and returns a picture */
-    public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
-
-    /** returns true iff the platform has a case-sensitive filesystem */
-    public static boolean isCaseSensitive() { return platform._isCaseSensitive(); }
+    /** convert a JPEG into an Image */
+    public static synchronized Picture decodeJPEG(InputStream is, String name) { return platform._decodeJPEG(is, name); }
+    protected Picture _decodeJPEG(InputStream is, String name) { 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; }
     public static String fileDialog(String suggestedFileName, boolean write) {
         if (!ThreadMessage.suspendThread()) return null;
         try {
@@ -259,6 +236,17 @@ public class Platform {
         }
     }
 
+    /** default implementation is Eric Albert's BrowserLauncher.java */
+    protected void _newBrowserWindow(String url) {
+        try {
+            Class c = Class.forName("edu.stanford.ejalbert.BrowserLauncher");
+            Method m = c.getMethod("openURL", new Class[] { String.class });
+            m.invoke(null, new String[] { url });
+        } catch (Exception e) {
+            Log.log(this, e);
+        }
+    }
+
     /** opens a new browser window */
     public static void newBrowserWindow(String url) {
         if (!(url.startsWith("https://") || url.startsWith("http://") || url.startsWith("ftp://") || url.startsWith("mailto:"))) {
@@ -280,15 +268,6 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
-    /** quits XWT */
-    public static void exit() {
-        Log.log(Platform.class, "exiting via Platform.exit()");
-        platform._exit();
-    }
-
-    /** the human-readable name of the key mapped to XWT's 'alt' key */
-    public static String altKeyName() { return platform._altKeyName(); }
-
     /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
     public static void criticalAbort(String message) {
         if (Log.on) Log.log(Platform.class, "Critical Abort:");
@@ -297,110 +276,52 @@ public class Platform {
     }
 
     /** this method invokes the platform _createSurface() method and then enforces a few post-call invariants */
+    protected Surface _createSurface(Box b, boolean framed) { return null; }
     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, ret.width);
-        b.set(Box.size, 1, ret.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);
-        if (icon != null && !"".equals(icon)) {
-            Picture pic = Box.getPicture(icon.toString());
+        Object icon = b.get("icon", true);
+        if (icon != null && icon instanceof Res) {
+            Picture pic = Picture.fromRes((Res)icon);
             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 HTTP.ProxyInfo detectProxy() {
+    protected synchronized HTTP.Proxy _detectProxy() { return null; }
+    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 xwt-proxy DNS proxy detection");
-        cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
+        if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
+        cachedProxyInfo = HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
         cachedProxyInfo = platform._detectProxy();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
-        if (Log.on) Log.log(Platform.class, "attempting WPAD proxy detection");
-        cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaWPAD();
-        if (cachedProxyInfo != null) return cachedProxyInfo;
-
         return cachedProxyInfo;
     }
-
-    // Helpful font parsing stuff //////////////////////////////////////////////////////
-
-    public static class ParsedFont {
-        public ParsedFont() { }
-        public ParsedFont(String s) { parse(s); }
-        public int size = 10;
-        public String name = "";
-
-        public boolean italic = false;
-        public boolean bold = false;
-        public boolean underline = false;
-        public boolean dotted_underline = false;
-
-        private static int stoi(Object o) {
-            if (o == null) return 0;
-            if (o instanceof Integer) return ((Integer)o).intValue();
-            
-            String s = o.toString(); 
-            try { return Integer.parseInt(s.indexOf('.') == -1 ? s : s.substring(0, s.indexOf('.'))); }
-            catch (NumberFormatException e) { return 0; }
-        }
-
-        public void parse(String font) {
-            int i = 0;
-            while(i < font.length() && !Character.isDigit(font.charAt(i)) && font.charAt(i) != '*') i++;
-            name = font.substring(0, i).toLowerCase().replace('_', ' ');
-            size = 10;
-            italic = false;
-            bold = false;
-            underline = false;
-            dotted_underline = false;
-            if (i != font.length()) {
-                if (font.charAt(i) == '*') {
-                    size = 0;
-                    i++;
-                } else {
-                    int j = i;
-                    while (j < font.length() && Character.isDigit(font.charAt(j))) j++;
-                    if (i != j) size = stoi(font.substring(i, j));
-                    i = j;
-                }
-                while(i < font.length()) {
-                    switch (font.charAt(i)) {
-                    case 'b': bold = true; break;
-                    case 'i': italic = true; break;
-                    case 'd': dotted_underline = true; break;
-                    case 'u': underline = true; break;
-                    }
-                    i++;
-                }
-            }
-        }
-
-    }
-
+    
+    public static void running() { platform._running(); }
+    public void _running() { new Semaphore().block(); }
 }