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

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 3e958c7..cedd03a 100644
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,6 +1,7 @@
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
+#include "resolution.h"
 
 std::vector<FT_Face> fonts;
 
@@ -14,16 +15,12 @@ void init_freetype()
 	// 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);
 	}
 	
@@ -31,16 +28,31 @@ void init_freetype()
 	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);
 	}
 }
 
-unsigned my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b)
+// 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))
+			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;
 
 	for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
 		int glyph_index;
@@ -49,7 +61,11 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, int xpos, int y
 			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;
@@ -59,31 +75,80 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, int xpos, int y
 			continue;
 		}
 
-		if (real_render) {
+		if (buf != NULL) {
 			int y;
 			FT_Bitmap *bm = &(slot->bitmap);
 			for (y = 0; y < bm->rows; y++) {
 				int xx;
 				int dsty = ypos - slot->bitmap_top + y;
-				if (dsty < 0 || dsty > 599) continue;
+				if (dsty < 0 || dsty > signed(screen_height-1)) continue;
 
-				unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4;
-				unsigned char *src = bm->buffer + y * bm->width;
-				for (xx = 0; xx < bm->width; xx++) {
-					*dst = (*dst * (256-*src) + r * *src) >> 8;
-					*dst++;
-					*dst = (*dst * (256-*src) + g * *src) >> 8;
-					*dst++;
+				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 = (*dst * (256-*src) + g * *src) >> 8;
+					++dst;
+					*dst = (*dst * (256-*src) + r * *src) >> 8;
+					++dst;
 					*dst++ = 0;
-					src++;
+					++src;
 				}
+#endif
 			}
 		}
 
 		x += slot->advance.x >> 6;
 	}
 
-	return x;
+	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)
+{
+	TextDefer newtd;
+	newtd.str = str;
+	newtd.size = size;
+	newtd.xpos = xpos;
+	newtd.ypos = ypos;
+	td.push_back(newtd);
 }
+
+void draw_all_deferred_text(unsigned char *buf, std::vector<TextDefer> &current, std::vector<TextDefer> &old)
+{
+	for (unsigned i = 0; i < current.size(); ++i) {
+		int r, g, b;
+		if (i < old.size() && current[i].str != old[i].str) {
+			// changed text
+			r = 255;
+			g = 0;
+			b = 0;
+		} else {
+			r = g = b = 255;
+		}	
+		
+		my_draw_text(current[i].str, buf, current[i].size, current[i].xpos, current[i].ypos, r, g, b);
+	}
+}
+