X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=0204b4d69a5e14dc3269d81ce6e3aa75f8b14d72;hb=6648a20efb79368af2fb16d1694afa685c04a0fc;hp=100da9b02391292f29a3f8c5f8bcfe22f641bb2d;hpb=2b0231dd1c60cb677b7ed69fcad4b6a53af560a7;p=org.ibex.core.git diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java index 100da9b..0204b4d 100644 --- a/src/org/xwt/plat/Win32.java +++ b/src/org/xwt/plat/Win32.java @@ -1,9 +1,10 @@ -// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL] package org.xwt.plat; import org.xwt.*; import org.xwt.util.*; import java.util.*; +import org.xwt.js.*; import java.io.*; /** Platform specific code for GCJ-compiled Win32 binaries */ @@ -43,16 +44,7 @@ public class Win32 extends GCJ { public Win32() { } - public void init() { - String logfile = getTempPath() + "xwt-log.txt"; - try { - PrintStream ps = new PrintStream(new FileOutputStream(logfile)); - System.setOut(ps); - System.setErr(ps); - } catch (Throwable e) { - criticalAbort("Exception while attempting to redirect logging to " + logfile + " -- " + e); - } - + public void postInit() { new Thread() { public void run() { natInit(); } }.start(); messagePumpStarted.block(); } @@ -65,7 +57,7 @@ public class Win32 extends GCJ { protected String getDescriptiveName() { return "GCJ Win32 Binary"; } protected Surface _createSurface(Box b, boolean framed) { return new Win32Surface(b, framed); } 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 Picture _createPicture(JS r) { return new Win32Picture(r); } protected native int _getScreenWidth(); protected native int _getScreenHeight(); protected boolean _supressDirtyOnResize() { return false; } @@ -79,21 +71,21 @@ public class Win32 extends GCJ { protected synchronized HTTP.Proxy _detectProxy() { String[] container = new String[] { null, null, null }; - if (Log.on) Log.log(this, "accessing Win32 registry"); + if (Log.on) Log.info(this, "accessing Win32 registry"); __detectProxy(container); if (container[2] == null && container[0] == null) { - if (Log.on) Log.log(this, "no proxy settings in the Win32 registry"); + if (Log.on) Log.info(this, "no proxy settings in the Win32 registry"); return null; } - if (Log.on) Log.log(this, "PAC Script URL: " + container[2]); - if (Log.on) Log.log(this, "Proxy Server String: " + container[0]); - if (Log.on) Log.log(this, "Proxy Override String: " + container[1]); + if (Log.on) Log.info(this, "PAC Script URL: " + container[2]); + if (Log.on) Log.info(this, "Proxy Server String: " + container[0]); + if (Log.on) Log.info(this, "Proxy Override String: " + container[1]); HTTP.Proxy ret = new HTTP.Proxy(); if (container[2] != null) { - ret.proxyAutoConfigJSFunction = HTTP.Proxy.getProxyAutoConfigJSFunction(container[2]); - if (ret.proxyAutoConfigJSFunction != null) return ret; + ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]); + if (ret.proxyAutoConfigFunction != null) return ret; } if (container[0] == null) return null; @@ -138,7 +130,7 @@ public class Win32 extends GCJ { protected native boolean _newBrowserWindow_(String url); protected void _newBrowserWindow(String url) { if (!_newBrowserWindow_(url)) - if (Log.on) Log.log(this, "ShellExecuteEx() failed trying to open url " + url); + if (Log.on) Log.info(this, "ShellExecuteEx() failed trying to open url " + url); } // Win32Surface //////////////////////////////////////////////////////////////////////////// @@ -205,8 +197,6 @@ public class Win32 extends GCJ { // Win32Picture //////////////////////////////////////////////////////////////////////////// public static class Win32Picture extends Picture { - int w = 0, h = 0; - int[] data = null; /** the Win32 bitmap version of this Picture */ int hbitmap = -1; @@ -226,11 +216,13 @@ public class Win32 extends GCJ { /** dc of the mask */ int maskdc = -1; - public int getWidth() { return w; }; - public int getHeight() { return h; }; + public Win32Picture(JS r) { super(r); } + public int getWidth() { return width; }; + public int getHeight() { return height; }; public int[] getData() { return data; } + boolean initialized = false; + public void init() { if (!initialized && isLoaded) natInit(); initialized = true; } public native void natInit(); - public Win32Picture(int[] data, int w, int h) { this.w = w; this.h = h; this.data = data; natInit(); } } @@ -263,10 +255,13 @@ public class Win32 extends GCJ { public native void fillRect(int x, int y, int x2, int y2, int color); public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) { + ((Win32Picture)source).init(); drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false); } - public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) { - drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, rgb, true); + public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) { + Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture()); + p.init(); + drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true); } public native void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb, boolean alphaOnly); @@ -274,7 +269,7 @@ public class Win32 extends GCJ { public native void finalize(); // FIXME: try to use os acceleration - public void fillJSTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int argb) { + 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