2003/12/13 08:13:34

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

diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java
index bcde5f0..b7f3b3b 100644 (file)
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/xwt/plat/AWT.java
@@ -16,7 +16,7 @@ public class AWT extends JVM {
 
     protected String getDescriptiveName() { return "Generic JDK 1.1+ with AWT"; }
     protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new AWTPixelBuffer(w, h); }
-    protected Picture _createPicture(int[] b, int w, int h) { return new AWTPicture(b, w, h); }
+    protected Picture _createPicture() { return new AWTPicture(); }
     protected int _getScreenWidth() { return Toolkit.getDefaultToolkit().getScreenSize().width; }
     protected int _getScreenHeight() { return Toolkit.getDefaultToolkit().getScreenSize().height; }
     protected Surface _createSurface(Box b, boolean framed) { return new AWTSurface(b, framed); }
@@ -115,18 +115,41 @@ public class AWT extends JVM {
 
     // Inner Classes /////////////////////////////////////////////////////////////////////////////////////
 
-    protected static class AWTPicture extends Picture {
-        public int getHeight() { return i.getHeight(null); }
-        public int getWidth() { return i.getWidth(null); } 
-        public int[] getData() { return data; }
+    protected org.xwt.Font.Glyph _createGlyph(org.xwt.Font f, char c) { return new AWTGlyph(f, c); }
+    protected static class AWTGlyph extends org.xwt.Font.Glyph {
+        private Image i = null;
+        static ColorModel cmodel = new DirectColorModel(8, 0x00000000, 0x00000000, 0x00000000, 0xFF);
+        public AWTGlyph(org.xwt.Font f, char c) { super(f, c); }
+        Image getImage() {
+            if (i == null && isLoaded) {
+                i = Toolkit.getDefaultToolkit().createImage(new MemoryImageSource(width, height, cmodel, data, 0, width));
+                MediaTracker mediatracker = new MediaTracker(new Canvas());
+                mediatracker.addImage(i, 1);
+                try { mediatracker.waitForAll(); } catch (InterruptedException e) { }
+                mediatracker.removeImage(i);
+                synchronized(AWTPixelBuffer.class) { 
+                    if (AWTPixelBuffer.component == null) {
+                        AWTPixelBuffer.component = new Frame();
+                        AWTPixelBuffer.component.setVisible(false);
+                        AWTPixelBuffer.component.addNotify();
+                    }
+                }
+                data = null;
+            }
+            return i;
+        }
+    }
 
+    protected static class AWTPicture extends Picture {
         int[] data = null;
         public Image i = null;
         private static ColorModel cmodel = new DirectColorModel(32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
         
-        public AWTPicture(int[] b, int w, int h) {
-            data = b;
-            i = Toolkit.getDefaultToolkit().createImage(new MemoryImageSource(w, h, cmodel, b, 0, w));
+        boolean initialized = false;
+        public void init() {
+            if (initialized) return;
+            initialized = true;
+            i = Toolkit.getDefaultToolkit().createImage(new MemoryImageSource(width, height, cmodel, data, 0, width));
             MediaTracker mediatracker = new MediaTracker(new Canvas());
             mediatracker.addImage(i, 1);
             try { mediatracker.waitForAll(); } catch (InterruptedException e) { }
@@ -166,13 +189,14 @@ public class AWT extends JVM {
         public int getWidth() { return i == null ? 0 : i.getWidth(null); }
 
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
+            ((AWTPicture)source).init();
             g.setClip(cx1, cy1, cx2 - cx1, cy2 - cy1);
             g.drawImage(((AWTPicture)source).i, dx, dy, null);
             g.setClip(0, 0, i.getWidth(null), i.getHeight(null));
         }
 
         /** implemented with java.awt 1.1's setXORMode() */
-        public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+        public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
 
             // XOR the target region
             g.setXORMode(new Color((rgb & 0x00ff0000) >> 16, (rgb & 0x0000ff00) >> 8, rgb & 0x000000ff));
@@ -181,7 +205,9 @@ public class AWT extends JVM {
 
             // blacken the area we want the glyph to cover
             g.setPaintMode();
-            drawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
+            g.setClip(cx1, cy1, cx2 - cx1, cy2 - cy1);
+            g.drawImage(((AWTGlyph)source).getImage(), dx, dy, null);
+            g.setClip(0, 0, i.getWidth(null), i.getHeight(null));
 
             // XOR back, turning black into the chosen rgb color
             g.setXORMode(new Color((rgb & 0x00ff0000) >> 16, (rgb & 0x0000ff00) >> 8, rgb & 0x000000ff));
@@ -437,7 +463,7 @@ public class AWT extends JVM {
         }
     }
 
-    protected Picture _decodeJPEG(InputStream is, String name) {
+    protected void _decodeJPEG(InputStream is, Picture p) {
         try {
             Image i = Toolkit.getDefaultToolkit().createImage(InputStreamToByteArray.convert(is));
             MediaTracker mediatracker = new MediaTracker(new Canvas());
@@ -449,15 +475,14 @@ public class AWT extends JVM {
             final int[] data = new int[width * height];
             PixelGrabber pg = new PixelGrabber(i, 0, 0, width, height, data, 0, width);
             pg.grabPixels();
-            if ((pg.getStatus() & ImageObserver.ABORT) != 0) {
-                Log.log(this, "PixelGrabber reported an error while decoding JPEG image " + name);
-                return null;
-            }
-            return Platform.createPicture(data, width, height);
+            if ((pg.getStatus() & ImageObserver.ABORT) != 0)
+                Log.log(this, "PixelGrabber reported an error while decoding JPEG image");
+            p.width = width;
+            p.height = height;
+            p.data = data;
         } catch (Exception e) {
-            Log.log(this, "Exception caught while decoding JPEG image " + name);
+            Log.log(this, "Exception caught while decoding JPEG image");
             Log.log(this, e);
-            return null;
         }
     }
 }