X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2FFont.java;h=451672e4a3ad254ffdb6c3af31657b56e78e8f6c;hb=707b1064f56e88db0cf555a99cb4aa224484f51a;hp=2744f0e11b105b7bf3c3ccd9f86916933272d48a;hpb=3591b88b94a6bb378af3d4abe6eb5233ce583104;p=org.ibex.core.git

diff --git a/src/org/ibex/Font.java b/src/org/ibex/Font.java
index 2744f0e..451672e 100644
--- a/src/org/ibex/Font.java
+++ b/src/org/ibex/Font.java
@@ -1,8 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.ibex;
-import org.xwt.translators.*;
+import org.ibex.translators.*;
 import org.ibex.util.*;
 import java.io.*;
+import java.util.Hashtable;
+
+import org.ibex.js.JSExn;
 
 // FEATURE: this could be cleaner
 /** encapsulates a single font (a set of Glyphs) */
@@ -29,13 +32,18 @@ public class Font {
         public int width = -1;                  ///< the width of the glyph
         public int height = -1;                 ///< the height of the glyph
         public byte[] data = null;              ///< the alpha channel samples for this font
+        void render() {
+            if (!isLoaded) try { freetype.renderGlyph(this); } catch (IOException e) { Log.info(Freetype.class, e); }
+            isLoaded = true;
+        }
     }
 
 
     // Statics //////////////////////////////////////////////////////////////////////
 
-    private static final Freetype freetype = new Freetype();
-    static final Queue glyphsToBeRendered = new Queue(255);
+    static final Freetype freetype = new Freetype();
+    static final Hashtable glyphsToBeCached = new Hashtable();
+    static final Hashtable glyphsToBeDisplayed = new Hashtable();
     private static Cache fontCache = new Cache(100);
     public static Font getFont(Stream stream, int pointsize) {
         Font ret = (Font)fontCache.get(stream, new Integer(pointsize));
@@ -48,62 +56,30 @@ public class Font {
 
     /**
      *  Rasterize the glyphs of <code>text</code>.
-     *
-     *  If all the glyphs of <code>text</code> are not yet loaded,
-     *  spawn a Task to load them and then invoke callback.  If all
-     *  the glyphs <i>are</i> loaded, rasterize them to the
-     *  PixelBuffer (if non-null).
-     *
-     *  @returns <code>(width&lt;&lt;32)|height</code> if all glyphs are loaded; else -1
+     *  @returns <code>(width&lt;&lt;32)|height</code>
      */
-    public long rasterizeGlyphs(final String text, PixelBuffer pb, int textcolor,
-                                int x, int y, int cx1, int cy1, int cx2, int cy2,
-                                final Scheduler.Task callback) {
-        boolean encounteredUnrenderedGlyph = false;
+    public long rasterizeGlyphs(String text, PixelBuffer pb, int textcolor, int x, int y, int cx1, int cy1, int cx2, int cy2) {
         int width = 0, height = 0;
-        for(int i=0; i<text.length(); i++) {
-            final char c = text.charAt(i);
-            Glyph g = glyphs[c];
-            if (g == null) {
-                g = Platform.createGlyph(this, c);
-                glyphs[c] = g;
-            }
-            if (!g.isLoaded) {
-                //Log.debug(Font.class, "rasterizeGlyphs encountered unrasterized glyph " + g.c + " of font " + this);
-                //System.out.println("rasterizeGlyphs encountered unrasterized glyph " + g.c + " of font " + this);
-                glyphsToBeRendered.prepend(g);              // even if it's already in the queue, boost its priority
-                encounteredUnrenderedGlyph = true;
-            } else if (!encounteredUnrenderedGlyph) {
-                if (pb != null) pb.drawGlyph(g, x + width, y + g.font.max_ascent - g.baseline, cx1, cy1, cx2, cy2, textcolor);
-                width += g.advance;
-                height = java.lang.Math.max(height, max_ascent + max_descent);
+        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;
             }
-        }
-
-        if (!encounteredUnrenderedGlyph) return ((((long)width) << 32) | (long)(height & 0xffffffffL));
-
-        if (callback != null) Scheduler.add(new Scheduler.Task() {
-                public void perform() throws Exception {
-                    // FEATURE this isn't terribly efficient... perhaps the task should go on the last glyph?
-                    for(int i=0; i<text.length(); i++) {
-                        Glyph g = glyphs[text.charAt(i)];
-                        if (g == null || !g.isLoaded) { Scheduler.add(this); return; }
-                    }
-                    callback.perform();
-                }});
-
-        // preload the Latin-1 charset with low priority (we'll probably want it)
-        if (!latinCharsPreloaded) {
-            for(int i=48; i<57; i++) glyphsToBeRendered.append(glyphs[i] = Platform.createGlyph(this, (char)i));
-            for(int i=32; i<47; i++) glyphsToBeRendered.append(glyphs[i] = Platform.createGlyph(this, (char)i));
-            for(int i=57; i<128; i++) glyphsToBeRendered.append(glyphs[i] = Platform.createGlyph(this, (char)i));
             latinCharsPreloaded = true;
         }
-        if (!glyphRenderingTaskIsScheduled) {
-            Scheduler.add(glyphRenderingTask);
-            glyphRenderingTaskIsScheduled = true;
+        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);
+            width += g.advance;
+            height = java.lang.Math.max(height, max_ascent + max_descent);
         }
-        return -1;
+        return ((((long)width) << 32) | (long)(height & 0xffffffffL));
     }
 
     // FEATURE do we really need to be caching sizes?
@@ -113,19 +89,22 @@ public class Font {
     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, null);
-        if (ret != -1) sizeCache.put(s, new Long(ret));
-        return ret == -1 ? 0 : ret;
+        long ret = rasterizeGlyphs(s, null, 0, 0, 0, 0, 0, 0, 0);
+        sizeCache.put(s, new Long(ret));
+        return ret;
     }
 
     static final Scheduler.Task glyphRenderingTask = new Scheduler.Task() { public void perform() {
-        Glyph g = (Glyph)glyphsToBeRendered.remove(false);
-        if (g == null) { glyphRenderingTaskIsScheduled = false; return; }
-        Log.debug(Font.class, "glyphRenderingTask dequeued glyph " + g.c + " of font " + g.font);
-        if (g.isLoaded) { perform(); /* tailcall to the next glyph */ return; }
-        Log.debug(Glyph.class, "rendering glyph " + g.c);
-        try { freetype.renderGlyph(g); } catch (IOException e) { Log.info(Freetype.class, e); }
-        Scheduler.add(this);          // keep ourselves in the queue until there are no glyphs to render
+        // 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);
+        g.render();
+        Log.debug(Glyph.class, "   done rendering glyph " + g.c);
         glyphRenderingTaskIsScheduled = true;
+        Scheduler.add(this);
     } };
 }