2004/01/12 06:38:31

[org.ibex.core.git] / src / org / xwt / plat / Win32.java

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index 218383d..0efdfa0 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -65,7 +65,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() { return new Win32Picture(); }
     protected native int _getScreenWidth();
     protected native int _getScreenHeight();
     protected boolean _supressDirtyOnResize() { return false; }
@@ -79,21 +79,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.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
-            if (ret.proxyAutoConfigFunction != null) return ret;
+            ret.proxyAutoConfigJSFunction = HTTP.Proxy.getProxyAutoConfigJSFunction(container[2]);
+            if (ret.proxyAutoConfigJSFunction != null) return ret;
         }
 
         if (container[0] == null) return null;
@@ -138,7 +138,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 ////////////////////////////////////////////////////////////////////////////
@@ -193,7 +193,7 @@ public class Win32 extends GCJ {
         public native void _setMinimized(boolean m);
         public native void setInvisible(boolean i);
         public native void _setMaximized(boolean m);
-        public native void setSize(int w, int h);
+        public native void _setSize(int w, int h);
         public native void setLocation();
         public native void setTitleBarText(String s);
         public native void setIcon(Picture p);
@@ -229,8 +229,9 @@ public class Win32 extends GCJ {
         public int getWidth() { return w; };
         public int getHeight() { return h; };
         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(); }
     }
     
 
@@ -261,19 +262,20 @@ public class Win32 extends GCJ {
             natInit();
         }
 
-        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 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 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 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);
 
         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) {