X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=218383dbc26d412900128a191e3a096e2f6ceb4a;hb=6c325e065eb458510c01999804a54c5c3e94e7d6;hp=4a143941b83172ff69fc747d5064ef07754be2e6;hpb=c6069948906645d974f46bdb96617a9a6a504636;p=org.ibex.core.git diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java index 4a14394..218383d 100644 --- a/src/org/xwt/plat/Win32.java +++ b/src/org/xwt/plat/Win32.java @@ -55,61 +55,6 @@ public class Win32 extends GCJ { new Thread() { public void run() { natInit(); } }.start(); messagePumpStarted.block(); - fontList = new String[fontListVec.size()]; - fontListVec.toArray(fontList); - fontListVec = null; - } - - - // Font Handling //////////////////////////////////////////////////////////////////////////// - - // FEATURE: query the registry for the user's default font - protected String _getDefaultFont() { return "dialog8"; } - protected int _getMaxAscent(String font) { return getFont(font).maxAscent; } - protected int _getMaxDescent(String font) { return getFont(font).maxDescent; } - protected native int _stringWidth(String font, String text); - - // methods/members used to enumerate platform fonts on startup - public static Vector fontListVec = new Vector(); - public static String[] fontList = null; - protected String[] _listFonts() { return fontList; } - public static void addFont(String name, int height, boolean italic, boolean bold) { - fontListVec.addElement(name.replace(' ', '_').toLowerCase() + "" + height + (italic ? "i" : "") + (bold ? "b" : "")); - } - - static Hash fontCache = new Hash(); - public static class Win32Font { - int hfont; - int maxAscent; - 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); - - /** takes an unparsed font and finds the closest platform-specific font */ - static Win32Font getFont(String font) { - Win32Font ret = (Win32Font)fontCache.get(font); - if (ret != null) return ret; - - Platform.ParsedFont pf = new Platform.ParsedFont(font); - 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 = "MS Sans Serif"; - else if (pf.name.equals("tty")) pf.name = "FixedSys"; - - ret = mapFont(pf); - fontCache.put(font, ret); - return ret; } @@ -119,7 +64,7 @@ public class Win32 extends GCJ { 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 PixelBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new Win32DoubleBuffer(w, h, (Win32Surface)owner); } + protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new Win32PixelBuffer(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(); @@ -131,7 +76,7 @@ public class Win32 extends GCJ { private native void __detectProxy(String[] container); - protected synchronized Proxy _detectProxy() { + protected synchronized HTTP.Proxy _detectProxy() { String[] container = new String[] { null, null, null }; if (Log.on) Log.log(this, "accessing Win32 registry"); @@ -145,9 +90,9 @@ public class Win32 extends GCJ { if (Log.on) Log.log(this, "Proxy Server String: " + container[0]); if (Log.on) Log.log(this, "Proxy Override String: " + container[1]); - Proxy ret = new Proxy(); + HTTP.Proxy ret = new HTTP.Proxy(); if (container[2] != null) { - ret.proxyAutoConfigFunction = Proxy.getProxyAutoConfigFunction(container[2]); + ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]); if (ret.proxyAutoConfigFunction != null) return ret; } @@ -198,7 +143,7 @@ public class Win32 extends GCJ { // Win32Surface //////////////////////////////////////////////////////////////////////////// - public static class Win32Surface extends Surface { + public static class Win32Surface extends Surface.DoubleBufferedSurface { /** used to block while waiting for the message pump thread to create a hwnd for us */ public Semaphore hwndCreated = new Semaphore(); @@ -249,7 +194,7 @@ public class Win32 extends GCJ { public native void setInvisible(boolean i); public native void _setMaximized(boolean m); public native void setSize(int w, int h); - public native void setLocation(int x, int y); + public native void setLocation(); public native void setTitleBarText(String s); public native void setIcon(Picture p); public native void _dispose(); @@ -291,7 +236,7 @@ public class Win32 extends GCJ { // Win32PixelBuffer ////////////////////////////////////////////////////////////////////////// - public static class Win32PixelBuffer extends DoubleBuffer { + public static class Win32PixelBuffer extends PixelBuffer { int w = 0; int h = 0; @@ -318,13 +263,31 @@ public class Win32 extends GCJ { public native void setClip(int x, int y, int x2, int y2); public native void fillRect(int x, int y, int x2, int y2, int color); - public native void drawString(String font, String text, int x, int y, int color); public native void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2); + + //public native void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2, + //int sx1, int sy1, int sx2, int sy2, int rgb); + public void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, int rgb) { } + public native void finalize(); public void drawPicture(Picture source, int x, int y) { drawPicture(source, x, y, x + source.getWidth(), y + source.getHeight(), 0, 0, source.getWidth(), source.getHeight()); } + // FIXME: try to use os acceleration + public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int argb) { + if (x1 == x3 && x2 == x4) { + fillRect(x1, y1, x4, y2, argb); + } else for(int y=y1; y _x2) { int _x0 = _x1; _x1 = _x2; _x2 = _x0; } + fillRect(_x1, _y1, _x2, _y2, argb); + } + } } }