X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fgraphics%2FFont.java;h=b2c30caf71570e59313bb2a31032ba68a083ecb3;hb=faa4ae356d464a80e08540d5eb8bbee6296c1dbc;hp=6df989986ff6e6d7e2f212026f7ccbb5152cdb05;hpb=91c9edbb2d4feafa859aa6becdb0793fbbc9852f;p=org.ibex.core.git
diff --git a/src/org/ibex/graphics/Font.java b/src/org/ibex/graphics/Font.java
index 6df9899..b2c30ca 100644
--- a/src/org/ibex/graphics/Font.java
+++ b/src/org/ibex/graphics/Font.java
@@ -1,27 +1,28 @@
-// 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.xwt.mips.*;
+import org.ibex.nestedvm.*;
import org.ibex.plat.*;
-import org.xwt.mips.Runtime;
+import org.ibex.nestedvm.Runtime;
// FEATURE: this could be cleaner
/** encapsulates a single font (a set of Glyphs) */
public class Font {
- private Font(Stream stream, int pointsize) { this.stream = stream; this.pointsize = pointsize; }
-
- private static boolean glyphRenderingTaskIsScheduled = false;
+ private Font(JS stream, int pointsize) { this.stream = stream; this.pointsize = pointsize; }
public final int pointsize; ///< the size of the font
- public final Stream stream; ///< the stream from which this font was loaded
+ public final JS stream; ///< the stream from which this font was loaded
public int max_ascent; ///< the maximum ascent, in pixels
public int max_descent; ///< the maximum descent, in pixels
boolean latinCharsPreloaded = false; ///< true if a request to preload ASCII 32-127 has begun
- Glyph[] glyphs = new Glyph[65535]; ///< the glyphs that comprise this font
+ public Glyph[] glyphs = new Glyph[65535]; ///< the glyphs that comprise this font
public abstract static class Glyph {
protected Glyph(Font font, char c) { this.font = font; this.c = c; }
@@ -33,6 +34,7 @@ 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
+ public String path = null; // FIXME this should be shared across point sizes
void render() {
if (!isLoaded) try { renderGlyph(this); } catch (IOException e) { Log.info(Font.class, e); }
isLoaded = true;
@@ -42,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);
- public static Font getFont(Stream 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));
+ 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) {
+ 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;
}
@@ -58,55 +63,69 @@ public class Font {
* Rasterize the glyphs of text
.
* @returns (width<<32)|height
*/
- 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>> 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 //////////////////////////////////////////////////////////////////////////////
@@ -114,14 +133,14 @@ public class Font {
// FEATURE: use streams, not memoryfont's
// FEATURE: kerning pairs
private static final Runtime rt;
- private static Stream loadedStream;
+ private static JS loadedStream;
private static int loadedStreamAddr;
static {
try {
rt = (Runtime)Class.forName("org.ibex.util.MIPSApps").newInstance();
} catch(Exception e) {
- throw new Error("Error instansiating freetype");
+ throw new Error("Error instantiating freetype: " + e);
}
rt.start(new String[]{"freetype"});
rt.execute();
@@ -130,12 +149,12 @@ public class Font {
private static void rtCheck() { if(rt.getState() != Runtime.PAUSED) throw new Error("Freetype exited " + rt.exitStatus()); }
- private static void loadFontByteStream(Stream res) {
+ private static void loadFontByteStream(JS res) {
if(loadedStream == res) return;
try {
- Log.info(Font.class, "loading font " + 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);
@@ -167,11 +186,16 @@ public class Font {
glyph.width = rt.getUserInfo(1);
glyph.height = rt.getUserInfo(2);
-
+
glyph.data = new byte[glyph.width * glyph.height];
int addr = rt.getUserInfo(0);
rt.copyin(addr, glyph.data, glyph.width * glyph.height);
+ byte[] path = new byte[rt.getUserInfo(8)];
+ rt.copyin(rt.getUserInfo(7), path, rt.getUserInfo(8));
+ glyph.path = new String(path);
+ glyph.path += " m " + (64 * glyph.advance) + " 0 ";
+
glyph.isLoaded = true;
} catch (Exception e) {
// FEATURE: Better error reporting (thow an exception?)