X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=0963cd5898768d4b77abd5d91880857596009820;hb=0474dacf886aee03e0081e9ae64e4e4c6721f2a5;hp=8efe59aa9efe7b9c4d1c088e0bdba12717b4143b;hpb=027607da259f292060d80e0ed90d2b0e896acd86;p=org.ibex.core.git diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java index 8efe59a..0963cd5 100644 --- a/src/org/xwt/Platform.java +++ b/src/org/xwt/Platform.java @@ -34,7 +34,10 @@ public class Platform { static boolean alreadyDetectedProxy = false; /** the result of proxy autodetection */ - static HTTP.ProxyInfo cachedProxyInfo = null; + static Proxy cachedProxyInfo = null; + + /** the current build */ + public static String build = "unknown"; // VM Detection Logic ///////////////////////////////////////////////////////////////////// @@ -51,6 +54,7 @@ public class Platform { 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"; @@ -62,27 +66,42 @@ public class Platform { else if (version.startsWith("1.4")) platform_class = "Java14"; else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12"; + // 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 (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"); - 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,6 +114,7 @@ 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 owner; we need to associate DoubleBuffers to surfaces * due to AWT 1.1 requirements (definately for Navigator, possibly also for MSJVM). @@ -106,7 +126,9 @@ public class Platform { /** creates a socket object */ 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 */ @@ -156,10 +178,18 @@ public class Platform { } /** quits XWT */ - protected void _exit() { System.exit(0); } + protected void _exit() { + if (Main.applet == null) { + System.exit(0); + } else { + // just block ourselves forever + // FIXME + new Semaphore().block(); + } + } /** 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); } + protected void _criticalAbort(String message) { _exit(); } /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */ protected String _getDefaultFont() { return "sansserif10"; } @@ -176,14 +206,41 @@ public class Platform { } /** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */ - protected synchronized HTTP.ProxyInfo _detectProxy() { return null; } + protected synchronized Proxy _detectProxy() { return null; } - /** displays a platform-specific "open file" dialog and returns the chosen filename */ + /** 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 */ protected boolean _isCaseSensitive() { return true; } + /** returns the value of the environment variable key, or null if no such key exists */ + 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; + } // Static methods -- thunk to the instance ///////////////////////////////////////////////////////////////////////// @@ -249,25 +306,16 @@ public class Platform { /** returns true iff the platform has a case-sensitive filesystem */ public static boolean isCaseSensitive() { return platform._isCaseSensitive(); } - /** displays a platform-specific "open file" dialog and returns the chosen filename */ - public static String fileDialog(String suggestedFileName, boolean write) { - // put ourselves in the background - Thread thread = Thread.currentThread(); - if (!(thread instanceof ThreadMessage)) { - if (Log.on) Log.log(Platform.class, "xwt.openFile may only be called from background threads"); - return null; - } - ThreadMessage mythread = (ThreadMessage)thread; - mythread.setPriority(Thread.MIN_PRIORITY); - mythread.done.release(); + /** 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); } + /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */ + public static String fileDialog(String suggestedFileName, boolean write) { + if (!ThreadMessage.suspendThread()) return null; try { return platform._fileDialog(suggestedFileName, write); } finally { - // okay, let ourselves be brought to the foreground - MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); - mythread.go.block(); + ThreadMessage.resumeThread(); } } @@ -277,6 +325,17 @@ public class Platform { if (Log.on) Log.log(Platform.class, "xwt.newBrowserWindow() only supports http and https urls"); return; } + + // check the URL for well-formedness, as a defense against buffer overflow attacks + try { + String u = url; + if (u.startsWith("https")) u = "http" + u.substring(5); + new URL(u); + } catch (MalformedURLException e) { + if (Log.on) Log.log(Platform.class, "URL " + url + " is not well-formed"); + if (Log.on) Log.log(Platform.class, e); + } + if (Log.on) Log.log(Platform.class, "newBrowserWindow, url = " + url); platform._newBrowserWindow(url); } @@ -301,8 +360,8 @@ public class Platform { 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); + 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)); Object titlebar = b.get("titlebar", null, true); if (titlebar != null) ret.setTitleBarText(titlebar.toString()); @@ -326,24 +385,20 @@ public class Platform { } /** detects proxy settings */ - public static synchronized HTTP.ProxyInfo detectProxy() { + public static synchronized 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 = 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; }