X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=86910a6b2757a4c27974274eecc2b874fde95eb4;hb=d4ec885cadcbcce077579bdd24c93ead18b06852;hp=8ceb87193b6cce7c9eae0dd228a56e4f698c9f39;hpb=4fce9b9798f93820661191b3bbc049c8d849f0fc;p=ccbs

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 8ceb871..86910a6 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
@@ -61,7 +62,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;
@@ -80,19 +85,38 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 				if (dsty < 0 || dsty > signed(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 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 = (*dst * (256-*src) + g * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst = (*dst * (256-*src) + r * *src) >> 8;
-					*dst++;
+					++dst;
 					*dst++ = 0;
-					src++;
+					++src;
 				}
+#endif
 			}
 		}
 
@@ -102,13 +126,19 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 	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)
+void my_draw_text_deferred(std::vector<TextDefer> &td, const widestring &str, double size, int xpos, int ypos, int r, int g, int b, int rn, int gn, int bn)
 {
 	TextDefer newtd;
 	newtd.str = str;
 	newtd.size = size;
 	newtd.xpos = xpos;
 	newtd.ypos = ypos;
+	newtd.r = r;
+	newtd.g = g;
+	newtd.b = b;
+	newtd.rn = rn;
+	newtd.gn = gn;
+	newtd.bn = bn;
 	td.push_back(newtd);
 }
 
@@ -118,11 +148,13 @@ void draw_all_deferred_text(unsigned char *buf, std::vector<TextDefer> &current,
 		int r, g, b;
 		if (i < old.size() && current[i].str != old[i].str) {
 			// changed text
-			r = 255;
-			g = 0;
-			b = 0;
+			r = current[i].rn;
+			g = current[i].gn;
+			b = current[i].bn;
 		} else {
-			r = g = b = 255;
+			r = current[i].r;
+			g = current[i].g;
+			b = current[i].b;
 		}	
 		
 		my_draw_text(current[i].str, buf, current[i].size, current[i].xpos, current[i].ypos, r, g, b);