From ea4af6dffcdce2a3e2e23923e5a78a5a1ac0a78f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 7 May 2014 12:46:33 +0100 Subject: Add glyphs used for list bullets. Added: WHITE CIRCLE BLACK SMALL_SQUARE --- framebuffer/GEN_font_internal.c | 102 ++++++++++++++++++++++----------------- framebuffer/res/fonts/glyph_data | 38 +++++++++++++++ 2 files changed, 96 insertions(+), 44 deletions(-) (limited to 'framebuffer') diff --git a/framebuffer/GEN_font_internal.c b/framebuffer/GEN_font_internal.c index 984b13e5e..26f26fb64 100644 --- a/framebuffer/GEN_font_internal.c +++ b/framebuffer/GEN_font_internal.c @@ -680,6 +680,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0436, 0x0437, 0x0438, 0x0439, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x043D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -687,8 +688,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0441, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -702,7 +702,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x043D, + 0x0000, 0x0000, 0x0000, 0x0444, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -716,7 +716,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x043E, 0x043F, + 0x0000, 0x0000, 0x0445, 0x0446, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -746,12 +746,12 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0440, 0x0441, - 0x0442, 0x0443, 0x0444, 0x0445, - 0x0446, 0x0447, 0x0444, 0x0445, - 0x0448, 0x0449, 0x044A, 0x044B, - 0x044C, 0x044D, 0x044E, 0x044F, - 0x044C, 0x044D, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0447, 0x0448, + 0x0449, 0x044A, 0x044B, 0x044C, + 0x044D, 0x044E, 0x044B, 0x044C, + 0x044F, 0x0450, 0x0451, 0x0452, + 0x0453, 0x0454, 0x0455, 0x0456, + 0x0453, 0x0454, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -770,11 +770,11 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0450, - 0x0000, 0x0000, 0x0000, 0x0454, + 0x0000, 0x0000, 0x0000, 0x0457, + 0x0000, 0x0000, 0x0000, 0x045B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0458, 0x0000, 0x0000, + 0x0000, 0x045F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -831,7 +831,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0459, + 0x0000, 0x0000, 0x0000, 0x0460, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -894,9 +894,9 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x045A, 0x0000, 0x0000, 0x045B, - 0x0000, 0x0000, 0x0000, 0x045C, - 0x0000, 0x045D, 0x0000, 0x0000, + 0x0461, 0x0000, 0x0000, 0x0462, + 0x0000, 0x0000, 0x0000, 0x0463, + 0x0000, 0x0464, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -917,7 +917,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x045E, 0x0000, 0x0000, + 0x0000, 0x0465, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -929,9 +929,9 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x045F, 0x0000, 0x0000, 0x0000, + 0x0466, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0460, 0x0000, 0x0000, 0x0000, + 0x0467, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -941,7 +941,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0461, + 0x0000, 0x0000, 0x0000, 0x0468, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -984,8 +984,8 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0462, - 0x0000, 0x0463, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0469, + 0x0000, 0x046A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1038,7 +1038,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0464, 0x0000, 0x0465, + 0x0000, 0x046B, 0x0000, 0x046C, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1140,7 +1140,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0466, + 0x0000, 0x0000, 0x0000, 0x046D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1181,7 +1181,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0467, 0x0000, + 0x0000, 0x0000, 0x046E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1214,7 +1214,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0468, 0x046C, 0x0000, + 0x0000, 0x046F, 0x0473, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1341,7 +1341,7 @@ const uint16_t fb_regular_sections[5120] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0470, 0x0471, 0x0000, 0x0000 + 0x0477, 0x0478, 0x0000, 0x0000 }; const uint8_t fb_italic_section_table[256] = { @@ -1997,6 +1997,7 @@ const uint16_t fb_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x043E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2004,8 +2005,7 @@ const uint16_t fb_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0442, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2023,8 +2023,8 @@ const uint16_t fb_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0451, - 0x0000, 0x0000, 0x0000, 0x0455, + 0x0000, 0x0000, 0x0000, 0x0458, + 0x0000, 0x0000, 0x0000, 0x045C, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2083,7 +2083,7 @@ const uint16_t fb_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0469, 0x046D, 0x0000, + 0x0000, 0x0470, 0x0474, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2802,6 +2802,7 @@ const uint16_t fb_bold_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x043F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2809,8 +2810,7 @@ const uint16_t fb_bold_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0441, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2828,8 +2828,8 @@ const uint16_t fb_bold_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0452, - 0x0000, 0x0000, 0x0000, 0x0456, + 0x0000, 0x0000, 0x0000, 0x0459, + 0x0000, 0x0000, 0x0000, 0x045D, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -2888,7 +2888,7 @@ const uint16_t fb_bold_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x046A, 0x046E, 0x0000, + 0x0000, 0x0471, 0x0475, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3607,6 +3607,7 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0440, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3614,8 +3615,7 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0443, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3633,8 +3633,8 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0453, - 0x0000, 0x0000, 0x0000, 0x0457, + 0x0000, 0x0000, 0x0000, 0x045A, + 0x0000, 0x0000, 0x0000, 0x045E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3693,7 +3693,7 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x046B, 0x046F, 0x0000, + 0x0000, 0x0472, 0x0476, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -3759,7 +3759,7 @@ const uint16_t fb_bold_italic_sections[3072] = { 0x0000, 0x0000, 0x0000, 0x0000 }; -const uint8_t font_glyph_data[18208] = { +const uint8_t font_glyph_data[18320] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -5930,6 +5930,20 @@ const uint8_t font_glyph_data[18208] = { 0x7B, 0xC6, 0xC6, 0xC6, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7F, 0x6B, 0x6B, 0x6A, 0xF6, 0xF6, 0xC6, 0xC6, 0xC6, 0xFE, 0xFE, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, + 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, + 0x1E, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, + 0x3E, 0x3E, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, + 0x3E, 0x7C, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x7E, + 0x66, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x3F, + 0x33, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x7E, + 0x72, 0x66, 0x7E, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x7C, 0x28, 0x44, 0x28, 0x54, 0x82, 0x82, 0x82, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0xAA, diff --git a/framebuffer/res/fonts/glyph_data b/framebuffer/res/fonts/glyph_data index 8f7fe3854..16377b75d 100644 --- a/framebuffer/res/fonts/glyph_data +++ b/framebuffer/res/fonts/glyph_data @@ -8290,6 +8290,44 @@ U+25F0 - WHITE SQUARE WITH UPPER LEFT QUADRANT ........ ........ ........ ........ ........ ........ ........ ........ ----------------------------------------------------- +U+25AA - BLACK SMALL SQUARE +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ..####.. ...####. ..#####. ..#####. + ..####.. ...####. ..#####. ..#####. + ..####.. ..####.. ..#####. .#####.. + ..####.. ..####.. ..#####. .#####.. + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ +----------------------------------------------------- +U+25CB - WHITE CIRCLE +- - - - - - - - - - - - - - - - - - - - - - - - - - - + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ..####.. ...####. ..####.. ...####. + .######. ..###### .######. .######. + .##..##. ..##..## .##..##. .###..#. + .##..##. .##..##. .##..##. .##..##. + .######. .######. .######. .######. + ..####.. ..####.. ..####.. ..####.. + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ + ........ ........ ........ ........ +----------------------------------------------------- U+2603 - SNOWMAN - - - - - - - - - - - - - - - - - - - - - - - - - - - ........ -- cgit v1.2.3