-// 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.*;
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";
String os_version = System.getProperty("os.version", "");
String platform_class = null;
- if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+ 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 = "X11";
else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
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) {
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");
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; }
};
}
- /** Called once XWT is initialized and the application is running. */
- protected void _running() {}
+ /** 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 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; }
/** returns an InputStream to the builtin xwar */
protected InputStream _getBuiltinInputStream() {
- return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+ return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.jar");
}
/** returns the value of the environment variable key, or null if no such key exists */
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()); }
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();
- }
-
+ /** 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()");
/** 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");
}
public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
- return platform._decodeJPEG(is, name);
+ return platform._decodeJPEG(is, name);
}
// Helpful font parsing stuff //////////////////////////////////////////////////////
projects / org.ibex.core.git / blobdiff