X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=cedd03affddd01fa4c859d3642177ea88bd9d646;hp=aa61303b61a997223eaf6139a09845422bd2b58a;hb=416d3d469d9ce4c15a860f61e24aee79da12402d;hpb=1f0419e8b9ad6225c901fdc9b272727547c08165

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index aa61303..cedd03a 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -32,19 +32,27 @@ void init_freetype()
 	}
 }
 
+// this should really be done somehow else :-)
+static unsigned screen_width = SCREEN_WIDTH, screen_height = SCREEN_HEIGHT;
+void set_screen_size(unsigned width, unsigned height)
+{
+	screen_width = width;
+	screen_height = height;
+}
+
 unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, int xpos, int ypos, int r, int g, int b)
 {
 	FT_GlyphSlot slot;
 	int x = 0;
 	
 	for (std::vector<FT_Face>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-		if (FT_Set_Char_Size(*i, 0, unsigned(size * 64.0), 96 * SCREEN_WIDTH/LOGICAL_SCREEN_WIDTH, 96 * SCREEN_HEIGHT/LOGICAL_SCREEN_HEIGHT))
+		if (FT_Set_Char_Size(*i, 0, unsigned(size * 64.0), 96 * screen_width/LOGICAL_SCREEN_WIDTH, 96 * screen_height/LOGICAL_SCREEN_HEIGHT))
 			throw std::runtime_error("Couldn't set font size");
 	}
 
 	// whoop :-P
-	xpos = xpos * SCREEN_WIDTH / LOGICAL_SCREEN_WIDTH;
-	ypos = ypos * SCREEN_HEIGHT / LOGICAL_SCREEN_HEIGHT;
+	xpos = xpos * screen_width / LOGICAL_SCREEN_WIDTH;
+	ypos = ypos * screen_height / LOGICAL_SCREEN_HEIGHT;
 
 	for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
 		int glyph_index;
@@ -53,7 +61,11 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 			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;
@@ -69,29 +81,48 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 			for (y = 0; y < bm->rows; y++) {
 				int xx;
 				int dsty = ypos - slot->bitmap_top + y;
-				if (dsty < 0 || dsty > (SCREEN_HEIGHT-1)) continue;
-
-				unsigned char *dst = buf + dsty * SCREEN_WIDTH*4 + (x + xpos + slot->bitmap_left)*4;
-				unsigned char *src = bm->buffer + y * bm->width;
+				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;
 
-				int width = (x + xpos + slot->bitmap_left + bm->width >= SCREEN_WIDTH) ? ((SCREEN_WIDTH-1) - x - xpos - slot->bitmap_left) : bm->width;
+					src += 3;
+				}
+#else
 				for (xx = 0; xx < width; xx++) {
 					*dst = (*dst * (256-*src) + b * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst = (*dst * (256-*src) + g * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst = (*dst * (256-*src) + r * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst++ = 0;
-					src++;
+					++src;
 				}
+#endif
 			}
 		}
 
 		x += slot->advance.x >> 6;
 	}
 
-	return x * LOGICAL_SCREEN_WIDTH / SCREEN_WIDTH;
+	return x * LOGICAL_SCREEN_WIDTH / screen_width;
 }
 
 void my_draw_text_deferred(std::vector<TextDefer> &td, const widestring &str, double size, int xpos, int ypos)