X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FFont.java;h=6f1e69a88609b92cc2c1cc3fd3690b77d37c66b5;hb=0db31fc0dc88749cd8022790fd475df8b7b06c27;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..6f1e69a 100644 --- a/src/org/ibex/graphics/Font.java +++ b/src/org/ibex/graphics/Font.java @@ -1,27 +1,31 @@ -// 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.core.*; +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 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 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 +37,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; @@ -44,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); - 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)); + // HACK: replace with Cache + private static Basket.Map fonts = new Basket.HashMap(); + 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.HashMap()); + if (ret == null) m.put(new Integer(pointsize), ret = new Font(stream, pointsize)); return ret; } @@ -83,7 +92,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) { @@ -94,18 +103,19 @@ public class Font { return ret; } - static final Task glyphRenderingTask = new Task() { public void perform() { + 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; } }; @@ -114,14 +124,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 +140,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 = res.getInputStream(); byte[] fontstream = InputStreamToByteArray.convert(is); rt.free(loadedStreamAddr); loadedStreamAddr = rt.xmalloc(fontstream.length); @@ -167,11 +177,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?)