X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FFont.java;h=b2c30caf71570e59313bb2a31032ba68a083ecb3;hp=35e9cf27091c030e6fe213b12945d17e26b82e6d;hb=098f2fd17df6500e8dad466c162c2e0589cc7df5;hpb=b0ec2e1d6c3bd35205dfffc6893f01157aef2ced

diff --git a/src/org/ibex/graphics/Font.java b/src/org/ibex/graphics/Font.java
index 35e9cf2..b2c30ca 100644
--- a/src/org/ibex/graphics/Font.java
+++ b/src/org/ibex/graphics/Font.java
@@ -1,4 +1,7 @@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.graphics;
 import org.ibex.util.*;
 import java.io.*;
@@ -14,8 +17,6 @@ public class Font {
 
     private Font(JS stream, int pointsize) { this.stream = stream; this.pointsize = pointsize; }
 
-    private static boolean glyphRenderingTaskIsScheduled = false;
-
     public final int pointsize;                 ///< the size of the font
     public final JS stream;                 ///< the stream from which this font was loaded
     public int max_ascent;                      ///< the maximum ascent, in pixels
@@ -43,12 +44,15 @@ public class Font {
 
     // Statics //////////////////////////////////////////////////////////////////////
 
-    static final Hashtable glyphsToBeCached = new Hashtable();
-    static final Hashtable glyphsToBeDisplayed = new Hashtable();
-    private static Cache fontCache = new Cache(100);
+    static final Queue toBeRasterized = new Queue(300);
+    static final Queue toBeDisplayed = new Queue(300);
+    private static Basket.Map fonts = new Basket.Hash();
     public static Font getFont(JS stream, int pointsize) {
-        Font ret = (Font)fontCache.get(stream, new Integer(pointsize));
-        if (ret == null) fontCache.put(stream, new Integer(pointsize), ret = new Font(stream, pointsize));
+        Basket.Map m = (Basket.Map)fonts.get(stream);
+        Font ret = null;
+        if (m != null) ret = (Font)m.get(new Integer(pointsize));
+        else fonts.put(stream, m = new Basket.Hash());
+        if (ret == null) m.put(new Integer(pointsize), ret = new Font(stream, pointsize));
         return ret;
     }
 
@@ -59,55 +63,69 @@ public class Font {
      *  Rasterize the glyphs of <code>text</code>.
      *  @returns <code>(width&lt;&lt;32)|height</code>
      */
-    public long rasterizeGlyphs(String text, PixelBuffer pb, int textcolor, int x, int y, int cx1, int cy1, int cx2, int cy2) {
+    public String rasterizeGlyphs(String text) {
+        StringBuffer path = new StringBuffer(text.length() * 50);
+        for(int i=0; i<text.length(); i++) {
+            final char c = text.charAt(i);
+            Glyph g = glyphs[c];
+            if (g == null) glyphs[c] = g = Platform.createGlyph(this, c);
+            g.render();
+            path.append(g.path);
+        }
+        return path.toString();
+    }
+    public long rasterizeGlyphs(String text, PixelBuffer pb, Affine a, Mesh h, int fg, int bg) {
         int width = 0, height = 0;
         if (!latinCharsPreloaded) {       // preload the Latin-1 charset with low priority (we'll probably want it)
-            for(int i=48; i<57; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
-            for(int i=32; i<47; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
-            for(int i=57; i<128; i++) if (glyphs[i]==null) glyphsToBeCached.put(glyphs[i]=Platform.createGlyph(this, (char)i),"");
-            if (!glyphRenderingTaskIsScheduled) {
-                Scheduler.add(glyphRenderingTask);
-                glyphRenderingTaskIsScheduled = true;
-            }
+            for(int i=48; i<57; i++) if(glyphs[i]==null) toBeRasterized.append(glyphs[i]=Platform.createGlyph(this, (char)i));
+            for(int i=32; i<47; i++) if(glyphs[i]==null) toBeRasterized.append(glyphs[i]=Platform.createGlyph(this, (char)i));
+            for(int i=57; i<128; i++) if(glyphs[i]==null) toBeRasterized.append(glyphs[i]=Platform.createGlyph(this, (char)i));
             latinCharsPreloaded = true;
         }
+        a = a==null ? null : a.copy();
         for(int i=0; i<text.length(); i++) {
             final char c = text.charAt(i);
             Glyph g = glyphs[c];
             if (g == null) glyphs[c] = g = Platform.createGlyph(this, c);
             g.render();
-            if (pb != null) pb.drawGlyph(g, x + width, y + g.font.max_ascent - g.baseline, cx1, cy1, cx2, cy2, textcolor);
+            if (a!=null) a.premultiply(Affine.translate(0, g.font.max_ascent - g.baseline));
+            if (pb != null) pb.drawGlyph(g, a, h, fg, bg);
+            if (a!=null) a.premultiply(Affine.translate(0, -1 * (g.font.max_ascent - g.baseline)));
             width += g.advance;
+            if (a!=null) a.premultiply(Affine.translate(g.advance, 0));
             height = java.lang.Math.max(height, max_ascent + max_descent);
         }
         return ((((long)width) << 32) | (long)(height & 0xffffffffL));
     }
 
     // FEATURE do we really need to be caching sizes?
-    private static Cache sizeCache = new Cache(1000);
+    private static Cache sizeCache = new Cache(1000, true);
     public int textwidth(String s) { return (int)((textsize(s) >>> 32) & 0xffffffff); }
     public int textheight(String s) { return (int)(textsize(s) & 0xffffffffL); }
     public long textsize(String s) {
         Long l = (Long)sizeCache.get(s);
         if (l != null) return ((Long)l).longValue();
-        long ret = rasterizeGlyphs(s, null, 0, 0, 0, 0, 0, 0, 0);
+        long ret = rasterizeGlyphs(s, null, null, null, 0, 0);
         sizeCache.put(s, new Long(ret));
         return ret;
     }
 
-    static final Task glyphRenderingTask = new Task() { public void perform() {
-        // FIXME: this should be a low-priority task
-        glyphRenderingTaskIsScheduled = false;
-        if (glyphsToBeCached.isEmpty()) return;
-        Glyph g = (Glyph)glyphsToBeCached.keys().nextElement();
-        if (g == null) return;
-        glyphsToBeCached.remove(g);
-        Log.debug(Font.class, "glyphRenderingTask rendering " + g.c + " of " + g.font);
+    public Glyph getGlyph(char c) {
+        rasterizeGlyphs(c+"", null, null, null, 0, 0);
+        Glyph g = glyphs[c];
         g.render();
-        Log.debug(Glyph.class, "   done rendering glyph " + g.c);
-        glyphRenderingTaskIsScheduled = true;
-        Scheduler.add(this);
-    } };
+        return g;
+    }
+
+    static { new Thread() { public void run() {
+        while(true) {
+            Glyph g = (Glyph)toBeRasterized.remove(true);
+            if (g == null) continue;
+            Log.debug(Font.class, "glyphRenderingTask rendering " + g.c + " of " + g.font);
+            g.render();
+            Log.debug(Glyph.class, "   done rendering glyph " + g.c);
+        }
+    } }.start(); }
 
 
     // FreeType Interface //////////////////////////////////////////////////////////////////////////////
@@ -135,8 +153,8 @@ public class Font {
         if(loadedStream == res) return;
         
         try {
-            Log.info(Font.class, "loading font " + JS.debugToString(res));
-            InputStream is = Stream.getInputStream(res);
+            Log.info(Font.class, "loading font " + JSU.str(res));
+            InputStream is = JSU.getInputStream(res);
             byte[] fontstream = InputStreamToByteArray.convert(is);
             rt.free(loadedStreamAddr);
             loadedStreamAddr = rt.xmalloc(fontstream.length);