X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=4b0f3c85541de609f435f7243a740413cb25b49b;hb=cb9749b300678e08c05bed4288ac200a13811b70;hp=0381157c687097dfe59642deb976b301b23c42a5;hpb=bbbf0f34d43aa3b6f43225fb6c2d45566a423ab1;p=ccbs

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 0381157..4b0f3c8 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -53,14 +53,26 @@ void init_freetype()
 			FT_Face face;
 			if (FT_New_Face(library, font_list[i].c_str(), 0, &face)) {
 				fprintf(stderr, "Warning: Couldn't open '%s', some glyphs might not be available\n", font_list[i].c_str());
+			} else {
+				faces[font_list[i]] = face;
 			}
-			faces[font_list[i]] = face;
 		}
 	}
 }
 
+void get_glyph(const std::vector<FT_Face> &fonts, wchar_t ch, FT_Face *face, int *glyph_index)
+{
+	for (std::vector<FT_Face>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+		*glyph_index = FT_Get_Char_Index(*i, ch);
+		if (*glyph_index == 0)
+			continue;
+		*face = *i;
+		return;
+	}
+}
+
 // this should really be done somehow else :-)
-static unsigned screen_width = SCREEN_WIDTH, screen_height = SCREEN_HEIGHT;
+static unsigned screen_width, screen_height;
 void set_screen_size(unsigned width, unsigned height)
 {
 	screen_width = width;
@@ -69,12 +81,12 @@ void set_screen_size(unsigned width, unsigned height)
 
 unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, const std::string &theme_element, int xpos, int ypos)
 {
-	FT_GlyphSlot slot;
 	int x = 0;
 
 	int r = atoi(get_theme_config(theme_element, "red").c_str());
 	int g = atoi(get_theme_config(theme_element, "green").c_str());
 	int b = atoi(get_theme_config(theme_element, "blue").c_str());
+	bool use_lcd = atoi(get_theme_config("screen", "lcd").c_str());
 
 	// Find font faces.
 	std::vector<FT_Face> fonts;
@@ -95,26 +107,23 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, co
 	ypos = ypos * screen_height / LOGICAL_SCREEN_HEIGHT;
 
 	for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
+		FT_Face face;
 		int glyph_index;
-		for (std::vector<FT_Face>::const_iterator j = fonts.begin(); j != fonts.end(); ++j) {
-			glyph_index = FT_Get_Char_Index(*j, *i);
-			if (glyph_index == 0)
-				continue;
-
-#if SCREEN_LCD
-			if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
-#else
-			if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER))
-#endif
-				throw std::runtime_error("Couldn't load glyph");
-			slot = (*j)->glyph;
-			break;
-		}
+		get_glyph(fonts, *i, &face, &glyph_index);
 		if (glyph_index == 0) {
-			std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%x, ignoring\n", *i);
+			std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%04x, ignoring\n", *i);
 			continue;
 		}
 
+		if (use_lcd) {
+			if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
+				throw std::runtime_error("Couldn't load glyph");
+		} else {
+			if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER))
+				throw std::runtime_error("Couldn't load glyph");
+		}
+
+		FT_GlyphSlot slot = face->glyph;
 		if (buf != NULL) {
 			int y;
 			FT_Bitmap *bm = &(slot->bitmap);
@@ -124,38 +133,33 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, co
 				if (dsty < 0 || dsty > signed(screen_height-1)) continue;
 
 				unsigned char *dst = buf + dsty * screen_width*4 + (x + xpos + slot->bitmap_left)*4;
-#if SCREEN_LCD
 				unsigned char *src = bm->buffer + y * bm->pitch;
-				int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
-#else
-				unsigned char *src = bm->buffer + y * bm->pitch;
-				int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
-#endif
-
-#if SCREEN_LCD
-				for (xx = 0; xx < width; xx++) {
-					*dst = (*dst * (256-src[2]) + b * src[2]) >> 8;
-					++dst;
-					*dst = (*dst * (256-src[1]) + g * src[1]) >> 8;
-					++dst;
-					*dst = (*dst * (256-src[0]) + r * src[0]) >> 8;
-					++dst;
-					*dst++ = 0;
-
-					src += 3;
-				}
-#else
-				for (xx = 0; xx < width; xx++) {
-					*dst = (*dst * (256-*src) + b * *src) >> 8;
-					++dst;
-					*dst = (*dst * (256-*src) + g * *src) >> 8;
-					++dst;
-					*dst = (*dst * (256-*src) + r * *src) >> 8;
-					++dst;
-					*dst++ = 0;
-					++src;
+				if (use_lcd) {
+					int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
+					for (xx = 0; xx < width; xx++) {
+						*dst = (*dst * (256-src[2]) + b * src[2]) >> 8;
+						++dst;
+						*dst = (*dst * (256-src[1]) + g * src[1]) >> 8;
+						++dst;
+						*dst = (*dst * (256-src[0]) + r * src[0]) >> 8;
+						++dst;
+						*dst++ = 0;
+
+						src += 3;
+					}
+				} else {
+					int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
+					for (xx = 0; xx < width; xx++) {
+						*dst = (*dst * (256-*src) + b * *src) >> 8;
+						++dst;
+						*dst = (*dst * (256-*src) + g * *src) >> 8;
+						++dst;
+						*dst = (*dst * (256-*src) + r * *src) >> 8;
+						++dst;
+						*dst++ = 0;
+						++src;
+					}
 				}
-#endif
 			}
 		}