X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fgraphics%2FFont.java;h=8e29b22d600181246ab7bf9000f74e32a68319af;hb=870d6acd4d14fe474454fe4e07d01233a490c49f;hp=96c65c4d03d567f8a83a4b7ae6a82001c02ce71b;hpb=e1a626a6cccf4846b90c98821f597429bf095d71;p=org.ibex.core.git

diff --git a/src/org/ibex/graphics/Font.java b/src/org/ibex/graphics/Font.java
index 96c65c4..8e29b22 100644
--- a/src/org/ibex/graphics/Font.java
+++ b/src/org/ibex/graphics/Font.java
@@ -1,9 +1,13 @@
-// 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.*;
 import java.util.Hashtable;
 import org.ibex.js.*;
+import org.ibex.core.*;
 import org.ibex.nestedvm.*;
 import org.ibex.plat.*;
 import org.ibex.nestedvm.Runtime;
@@ -45,10 +49,14 @@ public class Font {
 
     static final Hashtable glyphsToBeCached = new Hashtable();
     static final Hashtable glyphsToBeDisplayed = new Hashtable();
-    private static Cache fontCache = new Cache(100);
+    // HACK: replace with Cache<JS, int>
+    private static Basket.Map fonts = new Basket.HashMap();
     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.HashMap());
+        if (ret == null) m.put(new Integer(pointsize), ret = new Font(stream, pointsize));
         return ret;
     }
 
@@ -60,6 +68,9 @@ public class Font {
      *  @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) {
+        return rasterizeGlyphs(text, pb, textcolor, x, y, cx1, cy1, cx2, cy2, 0); }
+    public long rasterizeGlyphs(String text, PixelBuffer pb, int textcolor, int x, int y,
+                                int cx1, int cy1, int cx2, int cy2, 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),"");
@@ -76,7 +87,14 @@ public class Font {
             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 (pb != null) pb.drawGlyph(g,
+                                         x + width,
+                                         y + g.font.max_ascent - g.baseline,
+                                         x+width,
+                                         cy1,
+                                         x+width+g.advance,
+                                         cy2,
+                                         textcolor, bg);
             width += g.advance;
             height = java.lang.Math.max(height, max_ascent + max_descent);
         }
@@ -84,7 +102,7 @@ public class Font {
     }
 
     // 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) {
@@ -95,18 +113,26 @@ public class Font {
         return ret;
     }
 
-    static final Task glyphRenderingTask = new Task() { public void perform() {
+    public Glyph getGlyph(char c) {
+        rasterizeGlyphs(c+"", null, 0, 0, 0, 0, 0, 0, 0);
+        Glyph g = glyphs[c];
+        g.render();
+        return g;
+    }
+
+    static final Callable glyphRenderingTask = new Callable() { public Object run(Object o) {
         // FIXME: this should be a low-priority task
         glyphRenderingTaskIsScheduled = false;
-        if (glyphsToBeCached.isEmpty()) return;
+        if (glyphsToBeCached.isEmpty()) return null;
         Glyph g = (Glyph)glyphsToBeCached.keys().nextElement();
-        if (g == null) return;
+        if (g == null) return null;
         glyphsToBeCached.remove(g);
         Log.debug(Font.class, "glyphRenderingTask rendering " + g.c + " of " + g.font);
         g.render();
         Log.debug(Glyph.class, "   done rendering glyph " + g.c);
         glyphRenderingTaskIsScheduled = true;
         Scheduler.add(this);
+        return null;
     } };
 
 
@@ -135,7 +161,7 @@ public class Font {
         if(loadedStream == res) return;
         
         try {
-            Log.info(Font.class, "loading font " + JS.debugToString(res));
+            Log.info(Font.class, "loading font " + JSU.str(res));
             InputStream is = res.getInputStream();
             byte[] fontstream = InputStreamToByteArray.convert(is);
             rt.free(loadedStreamAddr);