X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FJava2.java;h=92c9aa3b09ee6a2545ea68b691aaae9f8a650ef4;hb=0db1ff365b2acfa1be6420aca33a27dd01eb78f2;hp=fd6b216d699eb1addaab2b4ead1a9457009ddf52;hpb=297fdbde87e6db4732448a0950d1141c7265c169;p=org.ibex.core.git

diff --git a/src/org/ibex/plat/Java2.java b/src/org/ibex/plat/Java2.java
index fd6b216..92c9aa3 100644
--- a/src/org/ibex/plat/Java2.java
+++ b/src/org/ibex/plat/Java2.java
@@ -21,13 +21,6 @@ public class Java2 extends AWT {
 
     protected String getDescriptiveName() { return "Java 1.2+ JVM"; }
     public Java2() {
-        // Properties for Apple JDK 1.3
-        System.setProperty("apple.awt.showGrowBox", "false");
-        System.setProperty("com.apple.hwaccel", "true");
-        System.setProperty("com.apple.forcehwaccel", "true");
-        System.setProperty("apple.awt.window.position.forceSafeUserPositioning", "true");
-        System.setProperty("apple.awt.window.position.forceSafeCreation", "true");
-
         // disable the focus manager so we can intercept the tab key
         javax.swing.FocusManager.setCurrentManager(new javax.swing.FocusManager() {
                 public void processKeyEvent(Component focusedComponent, KeyEvent anEvent) { }
@@ -97,6 +90,7 @@ public class Java2 extends AWT {
 
     public static class Java2Surface extends AWTSurface {
         public Java2Surface(Box root, boolean framed) { super(root, framed); }
+        public PixelBuffer getPixelBuffer() { return pb==null?(pb=new Java2PixelBuffer(this)):pb; }
         protected void _setMinimized(boolean b) {
             if (frame == null) Log.info(this, "JDK 1.2 can only minimize frames, not windows");
             else if (b) frame.setState(java.awt.Frame.ICONIFIED);
@@ -123,9 +117,27 @@ public class Java2 extends AWT {
         private static int[] ys = new int[65535];
         private static GeneralPath gp = new GeneralPath();
 
-        public void fill(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, true, false); }
-        public void stroke(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, false, true); }
-        public void fillStroke(org.ibex.graphics.Polygon p, org.ibex.graphics.Paint paint, boolean fill, boolean stroke) {
+        // this doens't seem to work on Windows
+        public void drawGlyph(org.ibex.graphics.Font.Glyph source, Affine a, Mesh h, int rgb, int bg) {
+            Image i = ((AWTGlyph)source).getImage();
+            Image i2 = ((AWTGlyph)source).i2;
+            if (((AWTGlyph)source).i2 == null) {
+                ((AWTGlyph)source).i2 = new BufferedImage(i.getWidth(null), i.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+                i2 = ((AWTGlyph)source).i2;
+                i2.getGraphics().drawImage(i, 0, 0, null);
+            }
+            Graphics2D g = (Graphics2D)((AWTGlyph)source).i2.getGraphics();
+            g.setComposite(AlphaComposite.SrcIn);
+            g.setColor(new java.awt.Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF)));
+            g.fillRect(0, 0, i2.getWidth(null), i2.getHeight(null));
+            Graphics2D g2 = (Graphics2D)getGraphics();
+            if (a!=null) g2.drawImage(i2, new java.awt.geom.AffineTransform(a.a, a.b, a.c, a.d, a.e, a.f), null);
+            else         g2.drawImage(i2, 0, 0, null);
+        }
+
+        public void fill(Mesh p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, true, false); }
+        public void stroke(Mesh p, org.ibex.graphics.Paint paint) { fillStroke(p, paint, false, true); }
+        public void fillStroke(Mesh p, org.ibex.graphics.Paint paint, boolean fill, boolean stroke) {/*
             if (g == null) g = getGraphics();
             ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); 
             int argb = ((org.ibex.graphics.Paint.SingleColorPaint)paint).color;
@@ -140,8 +152,9 @@ public class Java2 extends AWT {
             }
             if (fill) ((Graphics2D)g).fill(gp);
             if (stroke) ((Graphics2D)g).draw(gp);
-        }
+                                                                                                     */}
 
+        public Java2PixelBuffer(Java2Surface s) { super(s); }
         public Java2PixelBuffer(int w, int h) {
             super(w,h);
             sm = cm.createCompatibleSampleModel(w, h);