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";
// 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 = "Carbon";
+ 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();
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 && Main.applet != null) Log.log(Platform.class, " browser = " + Main.applet.getParameter("browser"));
+ 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");
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(); }
}
/** 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, 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 an InputStream to the builtin xwar */
+ protected InputStream _getBuiltinInputStream() {
+ return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+ }
+
/** 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) {
+ 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("nt") > -1) || (os.indexOf("windows 2000") > -1) ) {
+ } 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");
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 */
/** 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()); }
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()");
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;
- 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;
}
/** 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 environment-variable DNS proxy detection");
- cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
+ 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;
}
+ public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
+ return platform._decodeJPEG(is, name);
+ }
+
// Helpful font parsing stuff //////////////////////////////////////////////////////
public static class ParsedFont {
projects / org.ibex.core.git / blobdiff