From d81a1caad5606498ee87571651c52e47783d61b9 Mon Sep 17 00:00:00 2001 From: urchlay Date: Tue, 2 Aug 2005 13:34:14 +0000 Subject: [PATCH] ConsoleFont is now the X11 9x15 font. Until we make the GUI 1024x768, this means the text is pretty huge. The 9x15 X font, BTW, is public domain. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@706 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/gui/ConsoleFont.hxx | 4627 ++++++++++++++++++++------------ 1 file changed, 2859 insertions(+), 1768 deletions(-) diff --git a/stella/src/gui/ConsoleFont.hxx b/stella/src/gui/ConsoleFont.hxx index 389b660bf..41526b344 100644 --- a/stella/src/gui/ConsoleFont.hxx +++ b/stella/src/gui/ConsoleFont.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: ConsoleFont.hxx,v 1.2 2005-06-16 00:55:59 stephena Exp $ +// $Id: ConsoleFont.hxx,v 1.3 2005-08-02 13:34:14 urchlay Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -25,41 +25,86 @@ #include "bspf.hxx" namespace GUI { - /* Font information: - name: win_crox0c - facename: -Cronyx-Fixed-Medium-R-Normal--10-100-75-75-C-60-Windows-1251 - w x h: 6x10 - size: 96 - ascent: 8 - descent: 2 - first char: 32 (0x20) - last char: 127 (0x7f) - default char: 32 (0x20) + name: 9x15 + facename: -Misc-Fixed-Medium-R-Normal--15-140-75-75-C-90-ISO10646-1 + w x h: 9x15 + size: 127 + ascent: 12 + descent: 3 + first char: 0 (0x00) + last char: 126 (0x7e) + default char: 0 (0x00) proportional: no - Copyright (C) 1994 Cronyx Ltd. + Public domain font. Share and enjoy. */ /* Font character bitmap data. */ static const uInt16 _console_font_bits[] = { -/* Character 32 (0x20): - width 6 - +------+ - | | - | | - | | - | | - | | - | | - | | - | | - | | - | | - +------+ +/* Character 0 (0x00): + width 9 + +---------+ + | | + | | + | ** ** * | + | * | + | * | + | * * | + | * | + | * | + | * * | + | * | + | * | + | * ** ** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, +0x6d00, +0x0100, +0x4000, +0x4100, +0x0100, +0x4000, +0x4100, +0x0100, +0x4000, +0x5b00, +0x0000, +0x0000, +0x0000, + +/* Character 32 (0x20): + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ +*/ +0x0000, +0x0000, +0x0000, +0x0000, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -70,50 +115,70 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 33 (0x21): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0000, +0x0000, +0x0800, +0x0800, 0x0000, -0x1000, 0x0000, 0x0000, /* Character 34 (0x22): - width 6 - +------+ - | | - | * * | - | * * | - | * * | - | | - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x2800, -0x2800, -0x2800, +0x0000, +0x1200, +0x1200, +0x1200, +0x0000, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -122,128 +187,178 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 35 (0x23): - width 6 - +------+ - | | - | * * | - | * * | - | *****| - | * * | - | *****| - | * * | - | * * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | * * | + | * * | + | ****** | + | * * | + | * * | + | ****** | + | * * | + | * * | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x2800, -0x2800, -0x7c00, -0x2800, -0x7c00, -0x2800, -0x2800, +0x0000, +0x0000, +0x2400, +0x2400, +0x7e00, +0x2400, +0x2400, +0x7e00, +0x2400, +0x2400, +0x0000, +0x0000, 0x0000, 0x0000, /* Character 36 (0x24): - width 6 - +------+ - | | - | * | - | *** | - | * * | - | *** | - | * *| - | *** | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | ***** | + | * * * | + | * * | + | * * | + | *** | + | * * | + | * * | + | * * * | + | ***** | + | * | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x3800, -0x5000, -0x3800, -0x1400, -0x3800, -0x1000, +0x0000, +0x0800, +0x3e00, +0x4900, +0x4800, +0x2800, +0x1c00, +0x0a00, +0x0900, +0x4900, +0x3e00, +0x0800, 0x0000, 0x0000, /* Character 37 (0x25): - width 6 - +------+ - | | - | * *| - | * * *| - | * * | - | * | - | * * | - | * * *| - | * * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * * | + | * * * | + | * * | + | * | + | * | + | * * | + | * * * | + | * * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, +0x2100, +0x5200, +0x5200, 0x2400, -0x5400, -0x2800, -0x1000, -0x2800, -0x5400, -0x4800, +0x0800, +0x0800, +0x1200, +0x2500, +0x2500, +0x4200, +0x0000, 0x0000, 0x0000, /* Character 38 (0x26): - width 6 - +------+ - | | - | * | - | * * | - | * * | - | * | - | * * *| - | * * | - | ** *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ** | + | * * | + | * * | + | * * | + | ** | + | ** * | + | * * * | + | * * | + | * * * | + | ** * | + | | + | | + | | + +---------+ */ 0x0000, -0x2000, -0x5000, -0x5000, -0x2000, -0x5400, +0x0000, +0x3000, 0x4800, -0x3400, +0x4800, +0x4800, +0x3000, +0x3100, +0x4a00, +0x4400, +0x4a00, +0x3100, +0x0000, 0x0000, 0x0000, /* Character 39 (0x27): - width 6 - +------+ - | | - | ** | - | * | - | * | - | | - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x1800, -0x1000, -0x2000, +0x0000, +0x0800, +0x0800, +0x0800, +0x0000, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -252,123 +367,168 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 40 (0x28): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + +---------+ */ 0x0000, +0x0400, +0x0800, 0x0800, 0x1000, -0x2000, -0x2000, -0x2000, +0x1000, +0x1000, +0x1000, +0x1000, 0x1000, 0x0800, +0x0800, +0x0400, 0x0000, 0x0000, /* Character 41 (0x29): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + +---------+ */ 0x0000, -0x2000, 0x1000, 0x0800, 0x0800, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0800, 0x0800, 0x1000, -0x2000, 0x0000, 0x0000, /* Character 42 (0x2a): - width 6 - +------+ - | | - | | - | * *| - | * * | - | *****| - | * * | - | * *| - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * * * | + | * * * | + | *** | + | * * * | + | * * * | + | * | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, -0x4400, -0x2800, -0x7c00, -0x2800, -0x4400, +0x0800, +0x4900, +0x2a00, +0x1c00, +0x2a00, +0x4900, +0x0800, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, /* Character 43 (0x2b): - width 6 - +------+ - | | - | | - | * | - | * | - | *****| - | * | - | * | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | * | + | * | + | * | + | ******* | + | * | + | * | + | * | + | | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, -0x1000, -0x1000, -0x7c00, -0x1000, -0x1000, +0x0000, +0x0000, +0x0800, +0x0800, +0x0800, +0x7f00, +0x0800, +0x0800, +0x0800, +0x0000, 0x0000, 0x0000, 0x0000, /* Character 44 (0x2c): - width 6 - +------+ - | | - | | - | | - | | - | | - | | - | ** | - | * | - | * | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | ** | + | ** | + | * | + | * | + | * | + +---------+ */ 0x0000, 0x0000, @@ -376,31 +536,46 @@ static const uInt16 _console_font_bits[] = { 0x0000, 0x0000, 0x0000, -0x1800, -0x1000, -0x2000, 0x0000, +0x0000, +0x0000, +0x0000, +0x0c00, +0x0c00, +0x0400, +0x0400, +0x0800, /* Character 45 (0x2d): - width 6 - +------+ - | | - | | - | | - | | - | *****| - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | | + | ******* | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, 0x0000, -0x7c00, +0x0000, +0x0000, +0x0000, +0x7f00, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -408,19 +583,24 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 46 (0x2e): - width 6 - +------+ - | | - | | - | | - | | - | | - | | - | * | - | *** | - | * | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | ** | + | ** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, @@ -428,1252 +608,1737 @@ static const uInt16 _console_font_bits[] = { 0x0000, 0x0000, 0x0000, -0x1000, -0x3800, -0x1000, +0x0000, +0x0000, +0x0000, +0x0000, +0x0c00, +0x0c00, +0x0000, +0x0000, 0x0000, /* Character 47 (0x2f): - width 6 - +------+ - | | - | *| - | *| - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, +0x0100, +0x0200, +0x0200, 0x0400, -0x0400, +0x0800, 0x0800, 0x1000, 0x2000, +0x2000, 0x4000, -0x4000, +0x0000, 0x0000, 0x0000, /* Character 48 (0x30): - width 6 - +------+ - | | - | * | - | * * | - | * *| - | * *| - | * *| - | * * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | *** | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | *** | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x2800, -0x4400, -0x4400, -0x4400, -0x2800, -0x1000, +0x0000, +0x1c00, +0x2200, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x2200, +0x1c00, +0x0000, 0x0000, 0x0000, /* Character 49 (0x31): - width 6 - +------+ - | | - | * | - | ** | - | * * | - | * | - | * | - | * | - | *****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | ** | + | * * | + | * * | + | * | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x3000, -0x5000, -0x1000, -0x1000, -0x1000, -0x7c00, -0x0000, -0x0000, - -/* Character 50 (0x32): - width 6 - +------+ - | | - | *** | - | * *| - | *| - | ** | - | * | - | * | - | *****| - | | - | | - +------+ -*/ -0x0000, -0x3800, -0x4400, -0x0400, -0x1800, -0x2000, -0x4000, -0x7c00, -0x0000, -0x0000, - -/* Character 51 (0x33): - width 6 - +------+ - | | - | *****| - | *| - | * | - | ** | - | *| - | * *| - | *** | - | | - | | - +------+ -*/ -0x0000, -0x7c00, -0x0400, -0x0800, -0x1800, -0x0400, -0x4400, -0x3800, -0x0000, -0x0000, - -/* Character 52 (0x34): - width 6 - +------+ - | | - | * | - | ** | - | * * | - | * * | - | *****| - | * | - | * | - | | - | | - +------+ -*/ 0x0000, 0x0800, 0x1800, 0x2800, 0x4800, -0x7c00, 0x0800, 0x0800, +0x0800, +0x0800, +0x0800, +0x7f00, +0x0000, +0x0000, +0x0000, + +/* Character 50 (0x32): + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * | + | * | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ +*/ +0x0000, +0x0000, +0x3e00, +0x4100, +0x4100, +0x0200, +0x0400, +0x0800, +0x1000, +0x2000, +0x4000, +0x7f00, +0x0000, +0x0000, +0x0000, + +/* Character 51 (0x33): + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | *** | + | * | + | * | + | * | + | * * | + | ***** | + | | + | | + | | + +---------+ +*/ +0x0000, +0x0000, +0x7f00, +0x0100, +0x0200, +0x0400, +0x0e00, +0x0100, +0x0100, +0x0100, +0x4100, +0x3e00, +0x0000, +0x0000, +0x0000, + +/* Character 52 (0x34): + width 9 + +---------+ + | | + | | + | * | + | ** | + | * * | + | * * | + | * * | + | * * | + | ******* | + | * | + | * | + | * | + | | + | | + | | + +---------+ +*/ +0x0000, +0x0000, +0x0200, +0x0600, +0x0a00, +0x1200, +0x2200, +0x4200, +0x7f00, +0x0200, +0x0200, +0x0200, +0x0000, 0x0000, 0x0000, /* Character 53 (0x35): - width 6 - +------+ - | | - | *****| - | * | - | * ** | - | ** *| - | *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * **** | + | ** * | + | * | + | * | + | * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x7c00, +0x0000, +0x7f00, 0x4000, -0x5800, -0x6400, -0x0400, -0x4400, -0x3800, +0x4000, +0x5e00, +0x6100, +0x0100, +0x0100, +0x0100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 54 (0x36): - width 6 - +------+ - | | - | ** | - | * | - | * | - | * ** | - | ** *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | **** | + | * | + | * | + | * | + | * **** | + | ** * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x1800, +0x0000, +0x1e00, 0x2000, 0x4000, -0x5800, -0x6400, -0x4400, -0x3800, +0x4000, +0x5e00, +0x6100, +0x4100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 55 (0x37): - width 6 - +------+ - | | - | *****| - | *| - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x7c00, +0x0000, +0x7f00, +0x0100, +0x0200, +0x0200, +0x0400, 0x0400, 0x0800, 0x0800, 0x1000, -0x2000, -0x2000, +0x1000, +0x0000, 0x0000, 0x0000, /* Character 56 (0x38): - width 6 - +------+ - | | - | *** | - | * *| - | * *| - | *** | - | * *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | *** | + | * * | + | * * | + | * * | + | *** | + | * * | + | * * | + | * * | + | * * | + | *** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x4400, -0x3800, -0x4400, -0x4400, -0x3800, +0x0000, +0x1c00, +0x2200, +0x4100, +0x2200, +0x1c00, +0x2200, +0x4100, +0x4100, +0x2200, +0x1c00, +0x0000, 0x0000, 0x0000, /* Character 57 (0x39): - width 6 - +------+ - | | - | *** | - | * *| - | * **| - | ** *| - | *| - | * | - | ** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * * | + | * ** | + | **** * | + | * | + | * | + | * | + | **** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x4c00, -0x3400, -0x0400, -0x0800, -0x3000, +0x0000, +0x3e00, +0x4100, +0x4100, +0x4100, +0x4300, +0x3d00, +0x0100, +0x0100, +0x0200, +0x3c00, +0x0000, 0x0000, 0x0000, /* Character 58 (0x3a): - width 6 - +------+ - | | - | | - | * | - | *** | - | * | - | | - | * | - | *** | - | * | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ** | + | ** | + | | + | | + | | + | ** | + | ** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, -0x1000, -0x3800, -0x1000, 0x0000, -0x1000, -0x3800, -0x1000, +0x0000, +0x0000, +0x0c00, +0x0c00, +0x0000, +0x0000, +0x0000, +0x0c00, +0x0c00, +0x0000, +0x0000, 0x0000, /* Character 59 (0x3b): - width 6 - +------+ - | | - | | - | * | - | *** | - | * | - | | - | ** | - | * | - | * | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ** | + | ** | + | | + | | + | | + | ** | + | ** | + | * | + | * | + | * | + +---------+ */ 0x0000, 0x0000, -0x1000, -0x3800, -0x1000, 0x0000, -0x1800, -0x1000, -0x2000, 0x0000, +0x0000, +0x0c00, +0x0c00, +0x0000, +0x0000, +0x0000, +0x0c00, +0x0c00, +0x0400, +0x0400, +0x0800, /* Character 60 (0x3c): - width 6 - +------+ - | | - | *| - | * | - | * | - | * | - | * | - | * | - | *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, +0x0200, 0x0400, 0x0800, 0x1000, 0x2000, +0x2000, 0x1000, 0x0800, 0x0400, +0x0200, +0x0000, 0x0000, 0x0000, /* Character 61 (0x3d): - width 6 - +------+ - | | - | | - | | - | *****| - | | - | *****| - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | ******* | + | | + | | + | ******* | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x7c00, 0x0000, -0x7c00, +0x0000, +0x0000, +0x7f00, +0x0000, +0x0000, +0x7f00, +0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* Character 62 (0x3e): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x4000, +0x0000, 0x2000, 0x1000, 0x0800, +0x0400, +0x0200, +0x0200, +0x0400, +0x0800, 0x1000, 0x2000, -0x4000, +0x0000, 0x0000, 0x0000, /* Character 63 (0x3f): - width 6 - +------+ - | | - | *** | - | * *| - | * | - | * | - | * | - | | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * | + | * | + | * | + | * | + | * | + | | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x0800, -0x1000, -0x1000, 0x0000, -0x1000, +0x3e00, +0x4100, +0x4100, +0x0100, +0x0200, +0x0400, +0x0800, +0x0800, +0x0000, +0x0800, +0x0000, 0x0000, 0x0000, /* Character 64 (0x40): - width 6 - +------+ - | | - | *** | - | * *| - | * **| - | * * *| - | * ** | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * **** | + | * * * | + | * * ** | + | * ** * | + | * | + | * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x4c00, -0x5400, -0x5800, +0x0000, +0x3e00, +0x4100, +0x4100, +0x4f00, +0x5100, +0x5300, +0x4d00, 0x4000, -0x3800, +0x4000, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 65 (0x41): - width 6 - +------+ - | | - | * | - | * * | - | * *| - | * *| - | *****| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * * | + | * * | + | * * | + | * * | + | * * | + | ******* | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x2800, -0x4400, -0x4400, -0x7c00, -0x4400, -0x4400, +0x0000, +0x0800, +0x1400, +0x2200, +0x4100, +0x4100, +0x4100, +0x7f00, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 66 (0x42): - width 6 - +------+ - | | - | **** | - | * *| - | * *| - | *** | - | * *| - | * *| - | **** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * * | + | ***** | + | * * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x7800, -0x2400, -0x2400, -0x3800, -0x2400, -0x2400, -0x7800, +0x0000, +0x7c00, +0x4200, +0x4100, +0x4200, +0x7c00, +0x4200, +0x4100, +0x4100, +0x4200, +0x7c00, +0x0000, 0x0000, 0x0000, /* Character 67 (0x43): - width 6 - +------+ - | | - | *** | - | * *| - | * | - | * | - | * | - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * | + | * | + | * | + | * | + | * | + | * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, +0x0000, +0x3e00, +0x4100, 0x4000, 0x4000, 0x4000, -0x4400, -0x3800, +0x4000, +0x4000, +0x4000, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 68 (0x44): - width 6 - +------+ - | | - | **** | - | * *| - | * *| - | * *| - | * *| - | * *| - | **** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x7800, -0x2400, -0x2400, -0x2400, -0x2400, -0x2400, -0x7800, +0x0000, +0x7c00, +0x4200, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4200, +0x7c00, +0x0000, 0x0000, 0x0000, /* Character 69 (0x45): - width 6 - +------+ - | | - | *****| - | * | - | * | - | **** | - | * | - | * | - | *****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | ***** | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ */ 0x0000, -0x7c00, +0x0000, +0x7f00, 0x4000, 0x4000, -0x7800, -0x4000, 0x4000, 0x7c00, +0x4000, +0x4000, +0x4000, +0x4000, +0x7f00, +0x0000, 0x0000, 0x0000, /* Character 70 (0x46): - width 6 - +------+ - | | - | *****| - | * | - | * | - | **** | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | ***** | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, +0x7f00, +0x4000, +0x4000, +0x4000, 0x7c00, 0x4000, 0x4000, -0x7800, 0x4000, 0x4000, 0x4000, 0x0000, 0x0000, +0x0000, /* Character 71 (0x47): - width 6 - +------+ - | | - | *** | - | * *| - | * | - | * | - | * **| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * | + | * | + | * | + | * *** | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, +0x0000, +0x3e00, +0x4100, 0x4000, 0x4000, -0x4c00, -0x4400, -0x3800, +0x4000, +0x4700, +0x4100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 72 (0x48): - width 6 - +------+ - | | - | * *| - | * *| - | * *| - | *****| - | * *| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | ******* | + | * * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x4400, -0x7c00, -0x4400, -0x4400, -0x4400, +0x0000, +0x4100, +0x4100, +0x4100, +0x4100, +0x7f00, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 73 (0x49): - width 6 - +------+ - | | - | *** | - | * | - | * | - | * | - | * | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, -0x3800, +0x0000, +0x3e00, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 74 (0x4a): - width 6 - +------+ - | | - | ***| - | *| - | *| - | *| - | *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | *****| + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * * | + | **** | + | | + | | + | | + +---------+ */ 0x0000, -0x1c00, -0x0400, -0x0400, -0x0400, -0x0400, -0x4400, -0x3800, +0x0000, +0x0f80, +0x0200, +0x0200, +0x0200, +0x0200, +0x0200, +0x0200, +0x0200, +0x4200, +0x3c00, +0x0000, 0x0000, 0x0000, /* Character 75 (0x4b): - width 6 - +------+ - | | - | * *| - | * * | - | * * | - | ** | - | * * | - | * * | - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | *** | + | * * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, +0x4100, +0x4200, 0x4400, 0x4800, -0x5000, -0x6000, +0x7000, 0x5000, 0x4800, 0x4400, +0x4200, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 76 (0x4c): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | * | - | *****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, 0x4000, 0x4000, 0x4000, 0x4000, 0x4000, 0x4000, -0x7c00, +0x4000, +0x4000, +0x4000, +0x7f00, +0x0000, 0x0000, 0x0000, /* Character 77 (0x4d): - width 6 - +------+ - | | - | * *| - | * *| - | ** **| - | * * *| - | * *| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | ** ** | + | * * * * | + | * * * * | + | * * * | + | * * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x6c00, -0x5400, -0x4400, -0x4400, -0x4400, +0x0000, +0x4100, +0x4100, +0x6300, +0x5500, +0x5500, +0x4900, +0x4900, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 78 (0x4e): - width 6 - +------+ - | | - | * *| - | * *| - | ** *| - | * * *| - | * **| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | ** * | + | * * * | + | * * * | + | * * * | + | * ** | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x6400, -0x5400, -0x4c00, -0x4400, -0x4400, +0x0000, +0x4100, +0x4100, +0x6100, +0x5100, +0x4900, +0x4500, +0x4300, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 79 (0x4f): - width 6 - +------+ - | | - | *** | - | * *| - | * *| - | * *| - | * *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x4400, -0x4400, -0x4400, -0x4400, -0x3800, +0x0000, +0x3e00, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 80 (0x50): - width 6 - +------+ - | | - | **** | - | * *| - | * *| - | **** | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ****** | + | * * | + | * * | + | * * | + | ****** | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x7800, -0x4400, -0x4400, -0x7800, +0x0000, +0x7e00, +0x4100, +0x4100, +0x4100, +0x7e00, 0x4000, 0x4000, 0x4000, +0x4000, +0x4000, +0x0000, 0x0000, 0x0000, /* Character 81 (0x51): - width 6 - +------+ - | | - | *** | - | * *| - | * *| - | * *| - | * *| - | * * *| - | *** | - | *| - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * * | + | * * * | + | ***** | + | * | + | ** | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, -0x4400, -0x4400, -0x4400, -0x5400, -0x3800, +0x0000, +0x3e00, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x5100, +0x4900, +0x3e00, 0x0400, +0x0300, 0x0000, /* Character 82 (0x52): - width 6 - +------+ - | | - | **** | - | * *| - | * *| - | **** | - | * * | - | * * | - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ****** | + | * * | + | * * | + | * * | + | ****** | + | * * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x7800, -0x4400, -0x4400, -0x7800, -0x5000, +0x0000, +0x7e00, +0x4100, +0x4100, +0x4100, +0x7e00, 0x4800, 0x4400, +0x4200, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 83 (0x53): - width 6 - +------+ - | | - | *** | - | * *| - | * | - | *** | - | *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ***** | + | * * | + | * * | + | * | + | *** | + | ** | + | * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x4400, +0x0000, +0x3e00, +0x4100, +0x4100, 0x4000, 0x3800, -0x0400, -0x4400, -0x3800, +0x0600, +0x0100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 84 (0x54): - width 6 - +------+ - | | - | *****| - | * | - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x7c00, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, +0x0000, +0x7f00, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0000, 0x0000, 0x0000, /* Character 85 (0x55): - width 6 - +------+ - | | - | * *| - | * *| - | * *| - | * *| - | * *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x4400, -0x4400, -0x4400, -0x4400, -0x3800, +0x0000, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 86 (0x56): - width 6 - +------+ - | | - | * *| - | * *| - | * *| - | * * | - | * * | - | * * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x4400, -0x2800, -0x2800, -0x2800, -0x1000, +0x0000, +0x4100, +0x4100, +0x4100, +0x2200, +0x2200, +0x2200, +0x1400, +0x1400, +0x1400, +0x0800, +0x0000, 0x0000, 0x0000, /* Character 87 (0x57): - width 6 - +------+ - | | - | * *| - | * *| - | * *| - | * * *| - | * * *| - | ** **| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * * | + | * * * | + | * * * | + | * * * | + | * * * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x4400, -0x5400, -0x5400, -0x6c00, -0x4400, +0x0000, +0x4100, +0x4100, +0x4100, +0x4100, +0x4900, +0x4900, +0x4900, +0x4900, +0x5500, +0x2200, +0x0000, 0x0000, 0x0000, /* Character 88 (0x58): - width 6 - +------+ - | | - | * *| - | * *| - | * * | - | * | - | * * | - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | * | + | * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x2800, -0x1000, -0x2800, -0x4400, -0x4400, +0x0000, +0x4100, +0x4100, +0x2200, +0x1400, +0x0800, +0x0800, +0x1400, +0x2200, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 89 (0x59): - width 6 - +------+ - | | - | * *| - | * *| - | * * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * * | + | * * | + | * * | + | * * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x4400, -0x4400, -0x2800, -0x1000, -0x1000, -0x1000, -0x1000, +0x0000, +0x4100, +0x4100, +0x2200, +0x1400, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0000, 0x0000, 0x0000, /* Character 90 (0x5a): - width 6 - +------+ - | | - | *****| - | *| - | * | - | * | - | * | - | * | - | *****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ******* | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ */ 0x0000, -0x7c00, +0x0000, +0x7f00, +0x0100, +0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, -0x7c00, +0x4000, +0x7f00, +0x0000, 0x0000, 0x0000, /* Character 91 (0x5b): - width 6 - +------+ - | | - | *** | - | * | - | * | - | * | - | * | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | **** | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | **** | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x2000, -0x2000, -0x2000, -0x2000, -0x2000, -0x3800, +0x1e00, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1000, +0x1e00, 0x0000, 0x0000, /* Character 92 (0x5c): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | *| - | *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, 0x4000, -0x4000, +0x2000, 0x2000, 0x1000, 0x0800, +0x0800, 0x0400, -0x0400, +0x0200, +0x0200, +0x0100, +0x0000, 0x0000, 0x0000, /* Character 93 (0x5d): - width 6 - +------+ - | | - | *** | - | * | - | * | - | * | - | * | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | **** | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | **** | + | | + | | + +---------+ */ 0x0000, -0x3800, -0x0800, -0x0800, -0x0800, -0x0800, -0x0800, -0x3800, +0x3c00, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x0400, +0x3c00, 0x0000, 0x0000, /* Character 94 (0x5e): - width 6 - +------+ - | | - | * | - | * * | - | * *| - | | - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * * | + | * * | + | * * | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x2800, -0x4400, +0x0000, +0x0800, +0x1400, +0x2200, +0x4100, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -1682,19 +2347,24 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 95 (0x5f): - width 6 - +------+ - | | - | | - | | - | | - | | - | | - | | - | | - | *****| - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + |******** | + | | + | | + +---------+ */ 0x0000, 0x0000, @@ -1704,28 +2374,43 @@ static const uInt16 _console_font_bits[] = { 0x0000, 0x0000, 0x0000, -0x7c00, +0x0000, +0x0000, +0x0000, +0x0000, +0xff00, +0x0000, 0x0000, /* Character 96 (0x60): - width 6 - +------+ - | | - | ** | - | * | - | * | - | | - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | * | + | * | + | * | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x3000, 0x1000, 0x0800, +0x0400, +0x0000, +0x0000, +0x0000, +0x0000, +0x0000, 0x0000, 0x0000, 0x0000, @@ -1734,800 +2419,1074 @@ static const uInt16 _console_font_bits[] = { 0x0000, /* Character 97 (0x61): - width 6 - +------+ - | | - | | - | | - | *** | - | *| - | ****| - | * *| - | ****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ***** | + | * | + | * | + | ****** | + | * * | + | * ** | + | **** * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3800, -0x0400, -0x3c00, -0x4400, -0x3c00, +0x0000, +0x0000, +0x3e00, +0x0100, +0x0100, +0x3f00, +0x4100, +0x4300, +0x3d00, +0x0000, 0x0000, 0x0000, /* Character 98 (0x62): - width 6 - +------+ - | | - | * | - | * | - | * ** | - | ** *| - | * *| - | ** *| - | * ** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * **** | + | ** * | + | * * | + | * * | + | * * | + | ** * | + | * **** | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, 0x4000, 0x4000, -0x5800, -0x6400, -0x4400, -0x6400, -0x5800, +0x4000, +0x5e00, +0x6100, +0x4100, +0x4100, +0x4100, +0x6100, +0x5e00, +0x0000, 0x0000, 0x0000, /* Character 99 (0x63): - width 6 - +------+ - | | - | | - | | - | *** | - | * *| - | * | - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ***** | + | * * | + | * | + | * | + | * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3800, -0x4400, +0x0000, +0x0000, +0x3e00, +0x4100, 0x4000, -0x4400, -0x3800, +0x4000, +0x4000, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 100 (0x64): - width 6 - +------+ - | | - | *| - | *| - | ** *| - | * **| - | * *| - | * **| - | ** *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | **** * | + | * ** | + | * * | + | * * | + | * * | + | * ** | + | **** * | + | | + | | + | | + +---------+ */ 0x0000, -0x0400, -0x0400, -0x3400, -0x4c00, -0x4400, -0x4c00, -0x3400, +0x0000, +0x0100, +0x0100, +0x0100, +0x3d00, +0x4300, +0x4100, +0x4100, +0x4100, +0x4300, +0x3d00, +0x0000, 0x0000, 0x0000, /* Character 101 (0x65): - width 6 - +------+ - | | - | | - | | - | *** | - | * *| - | *****| - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ***** | + | * * | + | * * | + | ******* | + | * | + | * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3800, -0x4400, -0x7c00, +0x0000, +0x0000, +0x3e00, +0x4100, +0x4100, +0x7f00, 0x4000, -0x3800, +0x4000, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 102 (0x66): - width 6 - +------+ - | | - | ** | - | * *| - | * | - | **** | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | *** | + | * * | + | * * | + | * | + | * | + | ***** | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, -0x1800, -0x2400, -0x2000, -0x7800, -0x2000, -0x2000, -0x2000, +0x0000, +0x0e00, +0x1100, +0x1100, +0x1000, +0x1000, +0x7c00, +0x1000, +0x1000, +0x1000, +0x1000, +0x0000, 0x0000, 0x0000, /* Character 103 (0x67): - width 6 - +------+ - | | - | | - | | - | ** *| - | * * | - | ** | - | * | - | *** | - | * *| - | *** | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | **** * | + | * * | + | * * | + | * * | + | **** | + | * | + | ***** | + | * * | + | * * | + | ***** | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3400, -0x4800, -0x3000, +0x0000, +0x0000, +0x3d00, +0x4200, +0x4200, +0x4200, +0x3c00, 0x4000, -0x3800, -0x4400, -0x3800, +0x3e00, +0x4100, +0x4100, +0x3e00, /* Character 104 (0x68): - width 6 - +------+ - | | - | * | - | * | - | * ** | - | ** *| - | * *| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * **** | + | ** * | + | * * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, 0x4000, 0x4000, -0x5800, -0x6400, -0x4400, -0x4400, -0x4400, +0x4000, +0x5e00, +0x6100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 105 (0x69): - width 6 - +------+ - | | - | * | - | | - | ** | - | * | - | * | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ** | + | | + | | + | *** | + | * | + | * | + | * | + | * | + | * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x1000, 0x0000, -0x3000, -0x1000, -0x1000, -0x1000, +0x1800, +0x0000, +0x0000, 0x3800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 106 (0x6a): - width 6 - +------+ - | | - | * | - | | - | ** | - | * | - | * | - | * | - | * * | - | * * | - | ** | - +------+ + width 9 + +---------+ + | | + | | + | ** | + | | + | | + | *** | + | * | + | * | + | * | + | * | + | * | + | * * | + | * * | + | * * | + | **** | + +---------+ */ 0x0000, -0x0800, 0x0000, -0x1800, -0x0800, -0x0800, -0x0800, -0x4800, -0x4800, -0x3000, +0x0600, +0x0000, +0x0000, +0x0e00, +0x0200, +0x0200, +0x0200, +0x0200, +0x0200, +0x4200, +0x4200, +0x4200, +0x3c00, /* Character 107 (0x6b): - width 6 - +------+ - | | - | * | - | * | - | * *| - | * * | - | *** | - | * * | - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | * | + | * | + | * | + | * * | + | * ** | + | * ** | + | ** | + | * ** | + | * ** | + | * * | + | | + | | + | | + +---------+ */ 0x0000, +0x0000, 0x4000, 0x4000, -0x4400, -0x4800, -0x7000, -0x4800, -0x4400, +0x4000, +0x4100, +0x4600, +0x5800, +0x6000, +0x5800, +0x4600, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 108 (0x6c): - width 6 - +------+ - | | - | ** | - | * | - | * | - | * | - | * | - | * | - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | *** | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, -0x3000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, +0x0000, 0x3800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 109 (0x6d): - width 6 - +------+ - | | - | | - | | - | ** * | - | * * *| - | * * *| - | * * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | *** ** | + | * * * | + | * * * | + | * * * | + | * * * | + | * * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x6800, -0x5400, -0x5400, -0x5400, -0x4400, +0x0000, +0x0000, +0x7600, +0x4900, +0x4900, +0x4900, +0x4900, +0x4900, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 110 (0x6e): - width 6 - +------+ - | | - | | - | | - | * ** | - | ** *| - | * *| - | * *| - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * **** | + | ** * | + | * * | + | * * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x5800, -0x6400, -0x4400, -0x4400, -0x4400, +0x0000, +0x0000, +0x5e00, +0x6100, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 111 (0x6f): - width 6 - +------+ - | | - | | - | | - | *** | - | * *| - | * *| - | * *| - | *** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ***** | + | * * | + | * * | + | * * | + | * * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3800, -0x4400, -0x4400, -0x4400, -0x3800, +0x0000, +0x0000, +0x3e00, +0x4100, +0x4100, +0x4100, +0x4100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 112 (0x70): - width 6 - +------+ - | | - | | - | | - | * ** | - | ** *| - | ** *| - | * ** | - | * | - | * | - | * | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * **** | + | ** * | + | * * | + | * * | + | * * | + | ** * | + | * **** | + | * | + | * | + | * | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x5800, -0x6400, -0x6400, -0x5800, +0x0000, +0x0000, +0x5e00, +0x6100, +0x4100, +0x4100, +0x4100, +0x6100, +0x5e00, 0x4000, 0x4000, 0x4000, /* Character 113 (0x71): - width 6 - +------+ - | | - | | - | | - | ** *| - | * **| - | * **| - | ** *| - | *| - | *| - | *| - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | **** * | + | * ** | + | * * | + | * * | + | * * | + | * ** | + | **** * | + | * | + | * | + | * | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3400, -0x4c00, -0x4c00, -0x3400, -0x0400, -0x0400, -0x0400, +0x0000, +0x0000, +0x3d00, +0x4300, +0x4100, +0x4100, +0x4100, +0x4300, +0x3d00, +0x0100, +0x0100, +0x0100, /* Character 114 (0x72): - width 6 - +------+ - | | - | | - | | - | * ** | - | ** *| - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * *** | + | ** * | + | * * | + | * | + | * | + | * | + | * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x5800, -0x6400, -0x4000, -0x4000, -0x4000, +0x0000, +0x0000, +0x4e00, +0x3100, +0x2100, +0x2000, +0x2000, +0x2000, +0x2000, +0x0000, 0x0000, 0x0000, /* Character 115 (0x73): - width 6 - +------+ - | | - | | - | | - | *** | - | * | - | *** | - | *| - | **** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ***** | + | * * | + | * | + | ***** | + | * | + | * * | + | ***** | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x3800, +0x0000, +0x0000, +0x3e00, +0x4100, 0x4000, -0x3800, -0x0400, -0x7800, +0x3e00, +0x0100, +0x4100, +0x3e00, +0x0000, 0x0000, 0x0000, /* Character 116 (0x74): - width 6 - +------+ - | | - | * | - | * | - | **** | - | * | - | * | - | * *| - | ** | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | * | + | * | + | ****** | + | * | + | * | + | * | + | * | + | * * | + | *** | + | | + | | + | | + +---------+ */ 0x0000, -0x2000, -0x2000, -0x7800, -0x2000, -0x2000, -0x2400, -0x1800, +0x0000, +0x0000, +0x1000, +0x1000, +0x7e00, +0x1000, +0x1000, +0x1000, +0x1000, +0x1100, +0x0e00, +0x0000, 0x0000, 0x0000, /* Character 117 (0x75): - width 6 - +------+ - | | - | | - | | - | * *| - | * *| - | * *| - | * **| - | ** *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | **** * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x4400, -0x4400, -0x4400, -0x4c00, -0x3400, +0x0000, +0x0000, +0x4200, +0x4200, +0x4200, +0x4200, +0x4200, +0x4200, +0x3d00, +0x0000, 0x0000, 0x0000, /* Character 118 (0x76): - width 6 - +------+ - | | - | | - | | - | * *| - | * *| - | * * | - | * * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * | + | * * | + | * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x4400, -0x4400, -0x2800, -0x2800, -0x1000, +0x0000, +0x0000, +0x4100, +0x4100, +0x2200, +0x2200, +0x1400, +0x1400, +0x0800, +0x0000, 0x0000, 0x0000, /* Character 119 (0x77): - width 6 - +------+ - | | - | | - | | - | * *| - | * *| - | * * *| - | * * *| - | * * | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * * | + | * * | + | * * * | + | * * * | + | * * * | + | * * * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x4400, -0x4400, -0x5400, -0x5400, -0x2800, +0x0000, +0x0000, +0x4100, +0x4100, +0x4900, +0x4900, +0x4900, +0x5500, +0x2200, +0x0000, 0x0000, 0x0000, /* Character 120 (0x78): - width 6 - +------+ - | | - | | - | | - | * *| - | * * | - | * | - | * * | - | * *| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * * | + | * * | + | * * | + | * | + | * * | + | * * | + | * * | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x4400, -0x2800, -0x1000, -0x2800, -0x4400, +0x0000, +0x0000, +0x4100, +0x2200, +0x1400, +0x0800, +0x1400, +0x2200, +0x4100, +0x0000, 0x0000, 0x0000, /* Character 121 (0x79): - width 6 - +------+ - | | - | | - | | - | * *| - | * *| - | * **| - | ** *| - | *| - | * *| - | *** | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | * * | + | * * | + | * * | + | * * | + | * * | + | * ** | + | *** * | + | * | + | * * | + | **** | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x4400, -0x4400, -0x4c00, -0x3400, -0x0400, -0x4400, -0x3800, +0x0000, +0x0000, +0x4200, +0x4200, +0x4200, +0x4200, +0x4200, +0x4600, +0x3a00, +0x0200, +0x4200, +0x3c00, /* Character 122 (0x7a): - width 6 - +------+ - | | - | | - | | - | *****| - | * | - | * | - | * | - | *****| - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | | + | | + | | + | ******* | + | * | + | * | + | * | + | * | + | * | + | ******* | + | | + | | + | | + +---------+ */ 0x0000, 0x0000, 0x0000, -0x7c00, +0x0000, +0x0000, +0x7f00, +0x0200, +0x0400, 0x0800, 0x1000, 0x2000, -0x7c00, +0x7f00, +0x0000, 0x0000, 0x0000, /* Character 123 (0x7b): - width 6 - +------+ - | | - | **| - | * | - | * | - | ** | - | * | - | * | - | **| - | | - | | - +------+ + width 9 + +---------+ + | | + | *** | + | * | + | * | + | * | + | * | + | ** | + | ** | + | * | + | * | + | * | + | * | + | *** | + | | + | | + +---------+ */ 0x0000, -0x0c00, -0x1000, +0x0700, 0x0800, -0x3000, 0x0800, -0x1000, -0x0c00, +0x0800, +0x0400, +0x1800, +0x1800, +0x0400, +0x0800, +0x0800, +0x0800, +0x0700, 0x0000, 0x0000, /* Character 124 (0x7c): - width 6 - +------+ - | | - | * | - | * | - | * | - | * | - | * | - | * | - | * | - | | - | | - +------+ + width 9 + +---------+ + | | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | * | + | | + | | + +---------+ */ 0x0000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, -0x1000, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, +0x0800, 0x0000, 0x0000, /* Character 125 (0x7d): - width 6 - +------+ - | | - | ** | - | * | - | * | - | ** | - | * | - | * | - | ** | - | | - | | - +------+ + width 9 + +---------+ + | | + | *** | + | * | + | * | + | * | + | * | + | ** | + | ** | + | * | + | * | + | * | + | * | + | *** | + | | + | | + +---------+ */ 0x0000, -0x6000, +0x7000, +0x0800, +0x0800, +0x0800, 0x1000, -0x2000, -0x1800, -0x2000, +0x0c00, +0x0c00, 0x1000, -0x6000, +0x0800, +0x0800, +0x0800, +0x7000, 0x0000, 0x0000, /* Character 126 (0x7e): - width 6 - +------+ - | | - | * *| - | * * *| - | * * | - | | - | | - | | - | | - | | - | | - +------+ + width 9 + +---------+ + | | + | | + | ** * | + | * * * | + | * ** | + | | + | | + | | + | | + | | + | | + | | + | | + | | + | | + +---------+ */ 0x0000, -0x2400, -0x5400, -0x4800, 0x0000, -0x0000, -0x0000, -0x0000, -0x0000, -0x0000, - -/* Character 127 (0x7f): - width 6 - +------+ - | | - | | - | | - | | - | | - | | - | | - | | - | | - | | - +------+ -*/ +0x3100, +0x4900, +0x4600, 0x0000, 0x0000, 0x0000, @@ -2540,20 +3499,152 @@ static const uInt16 _console_font_bits[] = { 0x0000, }; +/* Character->glyph mapping. */ +static const uInt16 _console_sysfont_offset[] = { + 15, /* (0x00) */ + 0, /* (0x01) */ + 0, /* (0x02) */ + 0, /* (0x03) */ + 0, /* (0x04) */ + 0, /* (0x05) */ + 0, /* (0x06) */ + 0, /* (0x07) */ + 0, /* (0x08) */ + 0, /* (0x09) */ + 0, /* (0x0a) */ + 0, /* (0x0b) */ + 0, /* (0x0c) */ + 0, /* (0x0d) */ + 0, /* (0x0e) */ + 0, /* (0x0f) */ + 0, /* (0x10) */ + 0, /* (0x11) */ + 0, /* (0x12) */ + 0, /* (0x13) */ + 0, /* (0x14) */ + 0, /* (0x15) */ + 0, /* (0x16) */ + 0, /* (0x17) */ + 0, /* (0x18) */ + 0, /* (0x19) */ + 0, /* (0x1a) */ + 0, /* (0x1b) */ + 0, /* (0x1c) */ + 0, /* (0x1d) */ + 0, /* (0x1e) */ + 0, /* (0x1f) */ + 15, /* (0x20) */ + 30, /* (0x21) */ + 45, /* (0x22) */ + 60, /* (0x23) */ + 75, /* (0x24) */ + 90, /* (0x25) */ + 105, /* (0x26) */ + 120, /* (0x27) */ + 135, /* (0x28) */ + 150, /* (0x29) */ + 165, /* (0x2a) */ + 180, /* (0x2b) */ + 195, /* (0x2c) */ + 210, /* (0x2d) */ + 225, /* (0x2e) */ + 240, /* (0x2f) */ + 255, /* (0x30) */ + 270, /* (0x31) */ + 285, /* (0x32) */ + 300, /* (0x33) */ + 315, /* (0x34) */ + 330, /* (0x35) */ + 345, /* (0x36) */ + 360, /* (0x37) */ + 375, /* (0x38) */ + 390, /* (0x39) */ + 405, /* (0x3a) */ + 420, /* (0x3b) */ + 435, /* (0x3c) */ + 450, /* (0x3d) */ + 465, /* (0x3e) */ + 480, /* (0x3f) */ + 495, /* (0x40) */ + 510, /* (0x41) */ + 525, /* (0x42) */ + 540, /* (0x43) */ + 555, /* (0x44) */ + 570, /* (0x45) */ + 585, /* (0x46) */ + 600, /* (0x47) */ + 615, /* (0x48) */ + 630, /* (0x49) */ + 645, /* (0x4a) */ + 660, /* (0x4b) */ + 675, /* (0x4c) */ + 690, /* (0x4d) */ + 705, /* (0x4e) */ + 720, /* (0x4f) */ + 735, /* (0x50) */ + 750, /* (0x51) */ + 765, /* (0x52) */ + 780, /* (0x53) */ + 795, /* (0x54) */ + 810, /* (0x55) */ + 825, /* (0x56) */ + 840, /* (0x57) */ + 855, /* (0x58) */ + 870, /* (0x59) */ + 885, /* (0x5a) */ + 900, /* (0x5b) */ + 915, /* (0x5c) */ + 930, /* (0x5d) */ + 945, /* (0x5e) */ + 960, /* (0x5f) */ + 975, /* (0x60) */ + 990, /* (0x61) */ + 1005, /* (0x62) */ + 1020, /* (0x63) */ + 1035, /* (0x64) */ + 1050, /* (0x65) */ + 1065, /* (0x66) */ + 1080, /* (0x67) */ + 1095, /* (0x68) */ + 1110, /* (0x69) */ + 1125, /* (0x6a) */ + 1140, /* (0x6b) */ + 1155, /* (0x6c) */ + 1170, /* (0x6d) */ + 1185, /* (0x6e) */ + 1200, /* (0x6f) */ + 1215, /* (0x70) */ + 1230, /* (0x71) */ + 1245, /* (0x72) */ + 1260, /* (0x73) */ + 1275, /* (0x74) */ + 1290, /* (0x75) */ + 1305, /* (0x76) */ + 1320, /* (0x77) */ + 1335, /* (0x78) */ + 1350, /* (0x79) */ + 1365, /* (0x7a) */ + 1380, /* (0x7b) */ + 1395, /* (0x7c) */ + 1410, /* (0x7d) */ + 1425, /* (0x7e) */ +}; + + static const FontDesc consoleDesc = { - "win_crox0c", /* font name */ - 6, /* max width in pixels */ - 10, /* height in pixels */ - 8, /* ascent (baseline) height */ - 32, /* first character in bitmap */ - 96, /* font size in glyphs */ - _console_font_bits, /* 16-bit right-padded bitmap data */ - 0, /* no encode table*/ /* offsets into bitmap data */ - 0, /* fixed width*/ /* character widths or NULL if fixed */ - 32, /* default char (not glyph index) */ - sizeof(_console_font_bits)/sizeof(uInt16) /* # words of bitmap_t bits */ + "9x15", + 9, + 15, + 12, + 0, + 127, + _console_font_bits, + _console_sysfont_offset, /* encode table */ + 0, /* fixed width*/ + 0, + sizeof(_console_font_bits)/sizeof(uInt16) }; -} // namespace GUI +} // End of namespace GUI #endif