-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL]
package org.xwt.plat;
import org.xwt.*;
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);
protected boolean _needsAutoClick() { return true; }
protected String getDescriptiveName() { return "GCJ Win32 Binary"; }
protected Surface _createSurface(Box b, boolean framed) { return new Win32Surface(b, framed); }
- protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new Win32DoubleBuffer(w, h, (Win32Surface)owner); }
+ protected PixelBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new Win32DoubleBuffer(w, h, (Win32Surface)owner); }
protected Picture _createPicture(int[] b, int w, int h) { return new Win32Picture(b, w, h); }
protected native int _getScreenWidth();
protected native int _getScreenHeight();
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;
}
boolean captured = false;
public int hwnd = -1;
- public int hdc = -1;
+ public int hdc = 0;
public int current_cursor = default_cursor;
public native void setTitleBarText(String s);
public native void setIcon(Picture p);
public native void _dispose();
- public native void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
+ public native void blit(PixelBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
}
// Win32Picture ////////////////////////////////////////////////////////////////////////////
- public static class Win32Picture implements Picture {
+ public static class Win32Picture extends Picture {
int w = 0, h = 0;
int[] data = null;
}
- // Win32DoubleBuffer //////////////////////////////////////////////////////////////////////////
+ // Win32PixelBuffer //////////////////////////////////////////////////////////////////////////
- public static class Win32DoubleBuffer implements DoubleBuffer {
+ public static class Win32PixelBuffer extends DoubleBuffer {
int w = 0;
int h = 0;
public int getWidth() { return w; }
public native void natInit();
- public Win32DoubleBuffer(int w, int h, Win32Surface owner) {
+ public Win32PixelBuffer(int w, int h, Win32Surface owner) {
this.w = w;
this.h = h;
clipx2 = w;