X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=00b00d2c8ea07bbc1bacbabd8cf9cca0e5e58d9e;hb=0b0673bbc7f06c5d5418d5ab7ad5961a464e2de0;hp=9216dcb21e519344ac9c9654cca4e24bec77521f;hpb=40e5508f9067514d947e1064dc99669a2670be9e;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 9216dcb..00b00d2 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -34,7 +34,7 @@ public class Platform {
     static boolean alreadyDetectedProxy = false;
 
     /** the result of proxy autodetection */
-    static HTTP.Proxy cachedProxyInfo = null;
+    static org.xwt.HTTP.Proxy cachedProxyInfo = null;
 
     /** the current build */
     public static String build = "unknown";
@@ -66,10 +66,9 @@ public class Platform {
             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"))
+            // Disable 2d hardware acceleration on Jaguar
+            if (os_name.equals("Mac OS X") && os_version.startsWith("10.2")) System.setProperty("com.apple.hwaccel", "false");
             */
-        System.setProperty("com.apple.hwaccel", "false");
 
             if (platform_class != null) {
                 platform = (Platform)Class.forName("org.xwt.plat." + platform_class).newInstance();
@@ -124,18 +123,15 @@ public class Platform {
     
     /** 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; }
-
-    /** 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 {
-        Socket ret = ssl ? new TinySSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
-        ret.setTcpNoDelay(true);
-        return ret;
+    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);
     }
-    
+
     /** 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; }
@@ -160,10 +156,6 @@ public class Platform {
     public static int getScreenHeight() { return platform._getScreenHeight(); }
     protected int _getScreenHeight() { return 480; }
 
-    /** 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; }
-
     /** 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); }
 
@@ -220,19 +212,16 @@ public class Platform {
 
     /** 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 {
-            return platform._fileDialog(suggestedFileName, write);
-        } finally {
-            ThreadMessage.resumeThread();
-        }
+    public static String fileDialog(String suggestedFileName, boolean write) throws org.xwt.js.JS.Exn {
+        return platform._fileDialog(suggestedFileName, write);
     }
 
     /** default implementation is Eric Albert's BrowserLauncher.java */
     protected void _newBrowserWindow(String url) {
         try {
-            edu.stanford.ejalbert.BrowserLauncher.openURL(url);
+            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);
         }
@@ -272,16 +261,6 @@ public class Platform {
         Surface ret = platform._createSurface(b, framed);
         ret.setInvisible(false);
 
-        Object titlebar = b.get("titlebar", true);
-        if (titlebar != null) ret.setTitleBarText(titlebar.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.minwidth, b.minheight, b.maxwidth, b.maxheight);
 
         if (refreshable) {
@@ -293,15 +272,15 @@ public class Platform {
     }
 
     /** detects proxy settings */
-    protected synchronized HTTP.Proxy _detectProxy() { return null; }
-    public static synchronized HTTP.Proxy detectProxy() {
+    protected synchronized org.xwt.HTTP.Proxy _detectProxy() { return null; }
+    public static synchronized org.xwt.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 = HTTP.Proxy.detectProxyViaManual();
+        cachedProxyInfo = org.xwt.HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
@@ -311,6 +290,12 @@ public class Platform {
         return cachedProxyInfo;
     }
 
+    /** returns a Scheduler instance; used to implement platform-specific schedulers */
+    protected Scheduler _getScheduler() { return new Scheduler(); }
+    public static Scheduler getScheduler() { return platform._getScheduler(); }
+    
+    public static void running() { platform._running(); }
+    public void _running() { new Semaphore().block(); }
 }