X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=f6d8da537f22d7064e3d31efc0c65cb0e5eba29a;hp=d71b4c1bc29e9eb7ffbbd452dd613bd4dcd60591;hb=1d80f455c7613198b690d6e21370e1016b20edca;hpb=83e4367eb9c36af60db540f7f6f2da97052ca3c3

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index d71b4c1..f6d8da5 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -6,6 +6,7 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <tinyptc.h>
+#include <endian.h>
 
 iconv_t ucs4_iconv;
 
@@ -49,7 +50,7 @@ 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, FT_Face symbolface);
+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<FT_Face> &fontlist);
 
 class Tournament {
 public:
@@ -58,7 +59,7 @@ public:
 };
 
 Tournament active_tournament;
-FT_Face font, symbolfont;
+std::vector<FT_Face> fonts;
 
 /* A trigger that sets a flag whenever it's trigged. */
 class FlagTrigger : pqxx::trigger {
@@ -139,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, symbolfont);
+		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());
 	}
@@ -152,41 +153,56 @@ 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_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.");
+		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, FT_Face symbolface)
+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<FT_Face> &fontlist)
 {
 	FT_GlyphSlot slot;
 	int x = 0;
 
 	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 (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);
+		int glyph_index;
+		for (std::vector<FT_Face>::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(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(*j, glyph_index, FT_LOAD_RENDER))
+				throw std::runtime_error("Couldn't load glyph");
+			slot = (*j)->glyph;
+			break;
+		}
+		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) {
@@ -221,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);