X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Ftranslators%2FFreetype.java;h=c8406dbc998bbd0ba53984852d7e6b7d80d0f56d;hb=16c24a73c1c1b2955db0bbbaf5a940215329bca1;hp=18934c91a5a00280320528c1cc63078dcac92a41;hpb=ee179c3ff98348acc2f7b5695440ac06a00bc475;p=org.ibex.core.git

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index 18934c9..c8406db 100644
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -6,66 +6,42 @@ 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 {
 
     public Freetype() { }
 
-    private static byte[] image = null;
-    private static final int FONT_RESERVED = 256*1024;
-
-    private org.xwt.mips.Interpreter vm = null;
+    private int mem_allocated = 0;
+    private Runtime vm = null;
 
-    private Res loadedStream = null;
+    private Stream loadedStream = null;
 
-    public void loadFontByteStream(Res res) {
+    public void loadFontByteStream(Stream res) {
         try {
-            Log.log(this, "loading font " + res.getDescriptiveName());
+            Log.info(this, "loading font " + res);
             loadedStream = res;
-            InputStream is = res.getInputStream();
+            InputStream is = Stream.getInputStream(res);
             byte[] fontstream = InputStreamToByteArray.convert(is);
-            if (image == null) image = InputStreamToByteArray.convert(Main.builtin.getInputStream("freetype.mips"));
-            vm = new org.xwt.mips.Interpreter(image);
-            int baseAddr = vm.sbrk(FONT_RESERVED);
+            vm = (Runtime)Class.forName("org.xwt.translators.MIPSApps").newInstance();
+            int baseAddr = vm.sbrk(fontstream.length);
             vm.copyout(fontstream, baseAddr, fontstream.length);
             vm.setUserInfo(0, baseAddr);
             vm.setUserInfo(1, fontstream.length);
-            vm.start(new String[]{ "freetype.mips" });
+            vm.start(new String[]{ "freetype" });
             vm.execute();
+            if(vm.getState() == Runtime.DONE) throw new Error("Freetype VM exited: " + vm.exitStatus());
         } catch (Exception e) {
-            Log.log(this, e);
+            Log.info(this, e);
         }
     }
 
     public synchronized void renderGlyph(Font.Glyph glyph) throws IOException {
-        int width = 0;
-        int height = 0;
-        byte[] data = null;
-        String key = glyph.font.res.getDescriptiveName() + ":" + glyph.c;
-        key = new String(Base64.encode(key.getBytes()));
-        File cacheFile = new java.io.File(System.getProperty("user.home") +
-                                          java.io.File.separatorChar + ".xwt" +
-                                          java.io.File.separatorChar + "caches" +
-                                          java.io.File.separatorChar + "glyphs" +
-                                          java.io.File.separatorChar +
-                                          key);
-        new java.io.File(cacheFile.getParent()).mkdirs();
-
-        if (cacheFile.exists()) {
-            DataInputStream dis = new DataInputStream(new FileInputStream(cacheFile));
-            width = dis.readInt();
-            height = dis.readInt();
-            glyph.font.max_ascent = dis.readInt();
-            glyph.font.max_descent = dis.readInt();
-            glyph.baseline = dis.readInt();
-            glyph.advance = dis.readInt();
-            data = new byte[width * height];
-            if (width != 0 && height != 0) dis.readFully(data);
-            
-        } else try {
-            System.out.println("cache miss!");
-            if (loadedStream != glyph.font.res) loadFontByteStream(glyph.font.res);
+        try {
+            Log.debug(this, "rasterizing glyph " + glyph.c + " of font " + glyph.font);
+            if (loadedStream != glyph.font.stream) loadFontByteStream(glyph.font.stream);
             vm.setUserInfo(2, (int)glyph.c);
             vm.setUserInfo(3, (int)glyph.c);
             vm.setUserInfo(4, glyph.font.pointsize);
@@ -76,29 +52,16 @@ public class Freetype {
             glyph.baseline = vm.getUserInfo(10);
             glyph.advance = vm.getUserInfo(11);
             
-            width = vm.getUserInfo(6);
-            height = vm.getUserInfo(7);
-
-            data = new byte[width * height];
+            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,data,width*height);
-            File tmp = new File(cacheFile.getCanonicalPath() + ".tmp");
-            DataOutputStream dis = new DataOutputStream(new FileOutputStream(tmp));
-            dis.writeInt(width);
-            dis.writeInt(height);
-            dis.writeInt(glyph.font.max_ascent);
-            dis.writeInt(glyph.font.max_descent);
-            dis.writeInt(glyph.baseline);
-            dis.writeInt(glyph.advance);
-            if (width != 0 && height != 0) dis.write(data, 0, data.length);
-            dis.close();
-            tmp.renameTo(cacheFile);
-
+            vm.copyin(addr, glyph.data, glyph.width * glyph.height);
+            glyph.isLoaded = true;
+            
         } catch (Exception e) {
-            Log.log(this, e);
+            Log.info(this, e);
         }
-
-        if (width == 0 || height == 0) Log.log(Freetype.class, "warning glyph has zero width/height");
-        glyph.p = Platform.createAlphaOnlyPicture(data, width, height);
     }
 }