int maxDescent;
}
+ /** Called once XWT is initialized and the application is running. On Win32, we need to block the main thread
+ * on a semaphore because if the main thread exits, the whole application quits. */
+ protected void _running() {
+ // gcj-win32 exit()'s when the original thread dies, so we have to deadlock ourselves
+ if (Log.on) Log.log(Main.class, "main thread blocking on new semaphore");
+ new org.xwt.util.Semaphore().block();
+ }
+
/** takes a parsed font and finds the closest platform-specific font */
static native Win32Font mapFont(Platform.ParsedFont pf);
if (pf.name.equals("serif")) pf.name = "Times New Roman";
else if (pf.name.equals("sansserif")) pf.name = "Arial";
else if (pf.name.equals("monospace")) pf.name = "Courier New";
- else if (pf.name.equals("dialog")) pf.name = "Arial";
+ else if (pf.name.equals("dialog")) pf.name = "MS Sans Serif";
else if (pf.name.equals("tty")) pf.name = "FixedSys";
ret = mapFont(pf);
// Implementation of Platform methods /////////////////////////////////////////////////////////
+ protected native String _getEnv(String key);
protected boolean _needsAutoClick() { return true; }
protected String getDescriptiveName() { return "GCJ Win32 Binary"; }
protected Surface _createSurface(Box b, boolean framed) { return new Win32Surface(b, framed); }
private native void __detectProxy(String[] container);
- protected synchronized HTTP.ProxyInfo _detectProxy() {
+ protected synchronized Proxy _detectProxy() {
String[] container = new String[] { null, null, null };
if (Log.on) Log.log(this, "accessing Win32 registry");
if (Log.on) Log.log(this, "Proxy Server String: " + container[0]);
if (Log.on) Log.log(this, "Proxy Override String: " + container[1]);
- HTTP.ProxyInfo ret = new HTTP.ProxyInfo();
+ Proxy ret = new Proxy();
if (container[2] != null) {
- ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]);
+ ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]);
if (ret.proxyAutoConfigFunction != null) return ret;
}
StringTokenizer st = new StringTokenizer(container[0], ";", false);
while(st.hasMoreTokens()) try {
String s = st.nextToken().trim();
- if (s.indexOf(':') == -1) continue;
String protocol, host;
- if (s.indexOf('=') == -1) {
+ if (s.indexOf(':') == -1) {
+ continue;
+ } else if (s.indexOf("://") != -1) {
+ protocol = s.substring(0, s.indexOf("://"));
+ s = s.substring(s.indexOf("://") + 3);
+ host = s.substring(0, s.indexOf(':'));
+ } else if (s.indexOf('=') == -1) {
protocol = "http";
host = s.substring(0, s.indexOf(':'));
} else {
boolean captured = false;
public int hwnd = -1;
- public int hdc = -1;
+ public int hdc = 0;
public int current_cursor = default_cursor;
// Win32Picture ////////////////////////////////////////////////////////////////////////////
- public static class Win32Picture implements Picture {
+ public static class Win32Picture extends Picture {
int w = 0, h = 0;
int[] data = null;
// Win32DoubleBuffer //////////////////////////////////////////////////////////////////////////
- public static class Win32DoubleBuffer implements DoubleBuffer {
+ public static class Win32DoubleBuffer extends DoubleBuffer {
int w = 0;
int h = 0;