X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Ftranslators%2FFreetype.java;h=7fc5447f100a4232cdb6e39f1273291427517964;hb=163ff4c57ec557bb8615f80e875f045cdfbad696;hp=ccb3004372b81a3706f505fd710b4c6967603c25;hpb=a071a56b6d9c9d38b85d23cc3eb287435322d0cc;p=org.ibex.core.git

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index ccb3004..7fc5447 100644
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -3,71 +3,63 @@ import org.xwt.*;
 import org.xwt.util.*;
 import java.io.*;
 import java.util.zip.*;
+import java.util.*;
+import org.bouncycastle.util.encoders.Base64;
+
+import org.xwt.mips.Runtime;
 
 // FEATURE: use streams, not memoryfont's
 // FEATURE: kerning pairs
 public class Freetype {
 
-    Freetype() { }
-
-    private static org.xwt.mips.Interpreter vm = null;
+    public Freetype() { }
 
-    public static synchronized void renderGlyphs(Res res, int pointsize, int firstGlyph, int lastGlyph, Cache glyphCache) {
-        try {
-           
-            if (vm == null) {
+    private int mem_allocated = 0;
+    private Runtime vm = null;
 
-                InputStream bis = Platform.getBuiltinInputStream();
-                ZipInputStream zis = new ZipInputStream(bis);
-                for(ZipEntry ze = zis.getNextEntry(); ze != null && !ze.getName().equals("freetype.mips"); ze = zis.getNextEntry()) { }
-                byte[] image = InputStreamToByteArray.convert(zis);
-                vm = new org.xwt.mips.Interpreter(image);
-                vm.start(new String[]{ "freetype.mips" });
-                vm.execute();
-            }
+    private Stream loadedStream = null;
 
-            int FONT_RESERVED = 256*1024;
-            int baseAddr = vm.sbrk(FONT_RESERVED);
-            
-            byte[] fontstream = InputStreamToByteArray.convert(res.getInputStream());
+    public void loadFontByteStream(Stream res) {
+        try {
+            Log.info(this, "loading font " + res);
+            loadedStream = res;
+            InputStream is = Stream.getInputStream(res);
+            byte[] fontstream = InputStreamToByteArray.convert(is);
+            vm = new MIPSApps();
+            int baseAddr = vm.sbrk(fontstream.length);
             vm.copyout(fontstream, baseAddr, fontstream.length);
             vm.setUserInfo(0, baseAddr);
             vm.setUserInfo(1, fontstream.length);
-            vm.setUserInfo(2, firstGlyph);
-            vm.setUserInfo(3, lastGlyph);
-            vm.setUserInfo(4, pointsize);
-            
+            vm.start(new String[]{ "freetype" });
+            vm.execute();
+            if(vm.getState() == Runtime.DONE) throw new Error("Freetype VM exited: " + vm.exitStatus());
+        } catch (Exception e) {
+            Log.info(this, e);
+        }
+    }
+
+    public synchronized void renderGlyph(Font.Glyph glyph) throws IOException {
+        try {
+            if (loadedStream != glyph.font.res) loadFontByteStream(glyph.font.res);
+            vm.setUserInfo(2, (int)glyph.c);
+            vm.setUserInfo(3, (int)glyph.c);
+            vm.setUserInfo(4, glyph.font.pointsize);
             long start = System.currentTimeMillis();
+            vm.execute();
+            glyph.font.max_ascent = vm.getUserInfo(8);
+            glyph.font.max_descent = vm.getUserInfo(9);
+            glyph.baseline = vm.getUserInfo(10);
+            glyph.advance = vm.getUserInfo(11);
+            
+            glyph.width = vm.getUserInfo(6);
+            glyph.height = vm.getUserInfo(7);
+            
+            glyph.data = new byte[glyph.width * glyph.height];
+            int addr = vm.getUserInfo(5);
+            vm.copyin(addr, glyph.data, glyph.width * glyph.height);
             
-            for(int g = firstGlyph; g <= lastGlyph; g++) {
-                vm.execute();
-                
-                Glyph glyph = new Glyph();
-                glyph.max_ascent = vm.getUserInfo(8);
-                glyph.max_descent = vm.getUserInfo(9) - glyph.max_ascent;
-                glyph.baseline = vm.getUserInfo(10);
-                glyph.advance = vm.getUserInfo(11);
-                glyph.c = (char)g;
-                
-                int width = vm.getUserInfo(6);
-                int height = vm.getUserInfo(7);
-                int[] data = new int[width * height];
-                int addr = vm.getUserInfo(5);
-
-                for(int i=0; i<width * height; i += 4) {
-                    int val = vm.memRead(addr + i);
-                    for (int k = 3; k >= 0; k--) {
-                        if (i + k < width * height)
-                            data[i + k] = (val & 0xff) << 24;
-                        val >>>= 8;
-                    }
-                }
-                
-                glyph.p = Platform.createPicture(data, width, height);
-                glyphCache.put(res, new Integer((g << 16) | pointsize), glyph);
-            }
         } catch (Exception e) {
-            Log.log(Freetype.class, e);
+            Log.info(this, e);
         }
     }
 }