From 83e4367eb9c36af60db540f7f6f2da97052ca3c3 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 19 Feb 2005 12:23:29 +0000 Subject: [PATCH 1/1] Use Georgia, but fall back to FreeSerif if there's a glyph we can't find. --- bigscreen/ccbs_bigscreen.cpp | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index 4f65b6c..d71b4c1 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -49,7 +49,7 @@ void pqxx::from_string(const char *from, widestring &to) to = from; } -int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, FT_Face face); +int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, FT_Face face, FT_Face symbolface); class Tournament { public: @@ -58,7 +58,7 @@ public: }; Tournament active_tournament; -FT_Face font; +FT_Face font, symbolfont; /* A trigger that sets a flag whenever it's trigged. */ class FlagTrigger : pqxx::trigger { @@ -139,7 +139,7 @@ void main_loop(pqxx::connection &conn) pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") ); unsigned y = 0; for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) { - my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255, font); + my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255, font, symbolfont); y += 20; // std::fprintf(stderr, "%s\n", i["title"].c_str()); } @@ -154,24 +154,40 @@ void init_freetype() FT_Library library; if (FT_Init_FreeType(&library)) throw std::logic_error("FreeType init failed."); - if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &font)) + if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &font)) + throw std::logic_error("Face opening failed."); + if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &symbolfont)) throw std::logic_error("Face opening failed."); if (FT_Set_Char_Size(font, 0, 12 * 64, 96, 96)) throw std::logic_error("Size set failed."); + if (FT_Set_Char_Size(symbolfont, 0, 12 * 64, 96, 96)) + throw std::logic_error("Size set failed."); } -int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, FT_Face face) +int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, FT_Face face, FT_Face symbolface) { - FT_GlyphSlot slot = face->glyph; + FT_GlyphSlot slot; int x = 0; - for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { + for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { + // try the normal font first, fall back if there's some special character int glyph_index = FT_Get_Char_Index(face, *i); - if (*i > 128) { - printf("Loading U+%x\n", *i); + if (glyph_index == 0) { + std::fprintf(stderr, "Couldn't find U+%x in primary face, falling back to symbol face\n", + *i); + glyph_index = FT_Get_Char_Index(symbolface, *i); + if (glyph_index == 0) { + std::fprintf(stderr, "Couldn't find U+%x in symbol face, ignoring\n", *i); + continue; + } + if (FT_Load_Glyph(symbolface, glyph_index, FT_LOAD_RENDER)) + throw std::runtime_error("Couldn't load glyph from symbol face"); + slot = symbolface->glyph; + } else { + if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER)) + throw std::runtime_error("Couldn't load glyph from primary face"); + slot = face->glyph; } - if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER)) - continue; if (real_render) { int y; -- 2.39.2