X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=8e09f0dda132d9465f4060973e928ccf302ef8a6;hp=b82ab35a1ffaf3947a4f057b33ad3b4e2b74bae8;hb=e99870759dc603bcce21a792ed30a4b227f11527;hpb=cb773758b67ea79aff43b90bcac32dda299b53e1

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index b82ab35..8e09f0d 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -9,20 +9,20 @@
 
 iconv_t ucs4_iconv;
 
-// UCS-4 string
-class widestring : public std::basic_string<unsigned>
+// 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<char *> (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 +36,20 @@ public:
 		}
 
 		erase(begin(), end());
-		std::copy(to_buf, reinterpret_cast<unsigned *> (outptr), std::back_inserter(*this));
+		std::copy(to_buf, reinterpret_cast<wchar_t *> (outptr), std::back_inserter(*this));
 
 		free(from_buf);
 		delete[] to_buf;
 	}
 };
 
-template<>
-void std::char_traits<unsigned>::assign(unsigned &to, unsigned const &from)
-{
-	to = from;
-}
-
-template<>
-unsigned *std::char_traits<unsigned>::copy(unsigned *to, unsigned const *from, unsigned n)
-{
-	return static_cast<unsigned *>(memcpy(to, from, n * sizeof(unsigned)));
-}
-
-template<>
-unsigned *std::char_traits<unsigned>::move(unsigned *to, unsigned const *from, unsigned n)
-{
-	return static_cast<unsigned *>(memmove(to, from, n * sizeof(unsigned)));
-}
-
-template<>
-unsigned *std::char_traits<unsigned>::assign(unsigned *to, size_t n, unsigned a)
-{
-	for (unsigned i = 0; i < n; ++i)
-		*to++ = a;
-	return to;
-}
-
-
 template<>
 void pqxx::from_string<widestring>(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:
@@ -85,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 {
@@ -166,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());
 	}
@@ -180,25 +153,41 @@ 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))
-		throw std::logic_error("Face opening failed.");
+		throw std::runtime_error("FreeType init failed.");
+	if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &font))
+		throw std::runtime_error("Face opening failed.");
+	if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &symbolfont))
+		throw std::runtime_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("Size set failed.");
+	if (FT_Set_Char_Size(symbolfont, 0, 12 * 64, 96, 96))
+		throw std::runtime_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;