X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=19937b246f9e10d672b42e14d1221aa7d62fad43;hp=3e6323ed6e3e8349686cd9dfe0a4ffb2e182e8c1;hb=5e25e532a03e76374d575105c22453e210e88cdd;hpb=1b29d94907b67e7f95a6c35a690c7ebdb33bd957 diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index 3e6323e..19937b2 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -6,23 +6,24 @@ #include #include FT_FREETYPE_H #include +#include iconv_t ucs4_iconv; -// UCS-4 string -class widestring : public std::basic_string +// UCS-4 string with support for getting from UTF-8 +class widestring : public std::wstring { public: void operator= (const char *from) { unsigned bytes = std::strlen(from); char *from_buf = strdup(from); - unsigned *to_buf = new unsigned[bytes + 1]; + wchar_t *to_buf = new wchar_t[bytes + 1]; char *inptr = from_buf, *outptr = reinterpret_cast (to_buf); size_t in_left = bytes; - size_t out_left = bytes * sizeof(unsigned); + size_t out_left = bytes * sizeof(wchar_t); size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left); if (ret == (size_t)(-1)) { @@ -36,47 +37,20 @@ public: } erase(begin(), end()); - std::copy(to_buf, reinterpret_cast (outptr), std::back_inserter(*this)); + std::copy(to_buf, reinterpret_cast (outptr), std::back_inserter(*this)); free(from_buf); delete[] to_buf; } }; -template<> -void std::char_traits::assign(unsigned &to, unsigned const &from) -{ - to = from; -} - -template<> -unsigned *std::char_traits::copy(unsigned *to, unsigned const *from, unsigned n) -{ - return static_cast(memcpy(to, from, n * sizeof(unsigned))); -} - -template<> -unsigned *std::char_traits::move(unsigned *to, unsigned const *from, unsigned n) -{ - return static_cast(memmove(to, from, n * sizeof(unsigned))); -} - -template<> -unsigned *std::char_traits::assign(unsigned *to, size_t n, unsigned a) -{ - for (unsigned i = 0; i < n; ++i) - *to++ = a; - return to; -} - - template<> 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, std::vector &fontlist); class Tournament { public: @@ -85,7 +59,7 @@ public: }; Tournament active_tournament; -FT_Face font; +std::vector fonts; /* A trigger that sets a flag whenever it's trigged. */ class FlagTrigger : pqxx::trigger { @@ -166,7 +140,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, fonts); y += 20; // std::fprintf(stderr, "%s\n", i["title"].c_str()); } @@ -179,26 +153,57 @@ void main_loop(pqxx::connection &conn) void init_freetype() { FT_Library library; + FT_Face face; if (FT_Init_FreeType(&library)) - throw std::logic_error("FreeType init failed."); - if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &font)) - 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."); + throw std::runtime_error("FreeType init failed."); + + // Georgia + if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &face)) + throw std::runtime_error("Face opening failed."); + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(face); + + // FreeSerif + if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &face)) { + std::fprintf(stderr, "Warning: Couldn't open FreeSerif, some glyphs might not be available\n"); + } else { + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(face); + } + + // Arial Unicode MS + if (FT_New_Face(library, "arialuni.ttf", 0, &face)) { + std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n"); + } else { + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(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) +int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector &fontlist) { - FT_GlyphSlot slot = face->glyph; + FT_GlyphSlot slot; int x = 0; - for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { - int glyph_index = FT_Get_Char_Index(face, *i); - if (*i > 128) { - printf("Loading U+%x\n", *i); + for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { + int glyph_index; + for (std::vector::const_iterator j = fontlist.begin(); j != fontlist.end(); ++j) { + glyph_index = FT_Get_Char_Index(*j, *i); + if (glyph_index == 0) + continue; + + if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER)) + throw std::runtime_error("Couldn't load glyph"); + slot = (*j)->glyph; + break; } - if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER)) + if (glyph_index == 0) { + std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%x, ignoring\n", *i); continue; + } if (real_render) { int y; @@ -232,7 +237,11 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, int main(int argc, char **argv) { - ucs4_iconv = iconv_open("ucs-4le", "utf-8"); // FIXME: will be broken for big endian! +#if __BYTE_ORDER == __LITTLE_ENDIAN + ucs4_iconv = iconv_open("ucs-4le", "utf-8"); +#else + ucs4_iconv = iconv_open("ucs-4be", "utf-8"); +#endif ptc_open("CCBS bigscreen", 800, 600); @@ -240,16 +249,19 @@ int main(int argc, char **argv) init_freetype(); pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_"); FlagTrigger tournament_changed(conn, "active_tournament"); + FlagTrigger rounds_changed(conn, "active_groups"); - // when active_tournament is changed, we destroy everything and start from scratch + // when active_tournament or active_rounds is changed, we destroy everything and start from scratch + // (at least currently) for ( ;; ) { tournament_changed.reset_flag(); + rounds_changed.reset_flag(); init(conn); do { main_loop(conn); conn.get_notifs(); - } while (!tournament_changed.get_flag()); - std::fprintf(stderr, "active_tournament changed, resetting...\n"); + } while (!tournament_changed.get_flag() && !rounds_changed.get_flag()); + std::fprintf(stderr, "active_tournament or active_groups changed, resetting...\n"); } } catch (const std::exception &e) { std::fprintf(stderr, "Exception: %s\n", e.what());