X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=ba99a8e72734a285c71ac553e4b2ec1a8fe4fac2;hb=8ca06b850fb51673a7cfe751643ea45ec528070d;hp=5485540eeda81922fe43be7bf3f1df0c8642ba6e;hpb=d527b4287c0d9eebe8ae30752ec0b531b930a480;p=org.ibex.core.git diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java index 5485540..ba99a8e 100644 --- a/src/org/xwt/plat/Win32.java +++ b/src/org/xwt/plat/Win32.java @@ -1,4 +1,4 @@ -// 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.*; @@ -55,53 +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; - } - - /** 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; } @@ -111,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 DoubleBuffer _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(); @@ -123,7 +76,7 @@ public class Win32 extends GCJ { private native void __detectProxy(String[] container); - protected synchronized HTTP.ProxyInfo _detectProxy() { + protected synchronized HTTP.Proxy _detectProxy() { String[] container = new String[] { null, null, null }; if (Log.on) Log.log(this, "accessing Win32 registry"); @@ -137,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]); - HTTP.ProxyInfo ret = new HTTP.ProxyInfo(); + HTTP.Proxy ret = new HTTP.Proxy(); if (container[2] != null) { - ret.proxyAutoConfigFunction = HTTP.ProxyInfo.getProxyAutoConfigFunction(container[2]); + ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]); if (ret.proxyAutoConfigFunction != null) return ret; } @@ -190,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(); @@ -205,7 +158,7 @@ public class Win32 extends GCJ { boolean captured = false; public int hwnd = -1; - public int hdc = -1; + public int hdc = 0; public int current_cursor = default_cursor; @@ -241,17 +194,17 @@ 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(); - 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; @@ -281,9 +234,9 @@ public class Win32 extends GCJ { } - // Win32DoubleBuffer ////////////////////////////////////////////////////////////////////////// + // Win32PixelBuffer ////////////////////////////////////////////////////////////////////////// - public static class Win32DoubleBuffer implements DoubleBuffer { + public static class Win32PixelBuffer extends PixelBuffer { int w = 0; int h = 0; @@ -300,7 +253,7 @@ public class Win32 extends GCJ { 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; @@ -310,13 +263,27 @@ 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 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); + } + } } }