X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=af9a9368ca2e06a02240c08a0710f0710ae575d8;hp=a2ac91b5a91c121cca23e7a8b79f947c65ea617c;hb=9c22e166f4d25f2d80766de9baab56efd9d952b0;hpb=59ec2de58b1a4d904a71bce150d389a700c0f954

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index a2ac91b..af9a936 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;
 
@@ -64,18 +65,18 @@ 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 > 599) continue;
+				if (dsty < 0 || dsty > (SCREEN_HEIGHT-1)) continue;
 
-				unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4;
+				unsigned char *dst = buf + dsty * SCREEN_WIDTH*4 + (x + xpos + slot->bitmap_left)*4;
 				unsigned char *src = bm->buffer + y * bm->width;
 
-				int width = (x + xpos + slot->bitmap_left + bm->width >= 800) ? (799 - x - xpos - slot->bitmap_left) : bm->width;
+				int width = (x + xpos + slot->bitmap_left + bm->width >= SCREEN_WIDTH) ? ((SCREEN_WIDTH-1) - x - xpos - slot->bitmap_left) : bm->width;
 				for (xx = 0; xx < width; xx++) {
-					*dst = (*dst * (256-*src) + r * *src) >> 8;
+					*dst = (*dst * (256-*src) + b * *src) >> 8;
 					*dst++;
 					*dst = (*dst * (256-*src) + g * *src) >> 8;
 					*dst++;
-					*dst = (*dst * (256-*src) + b * *src) >> 8;
+					*dst = (*dst * (256-*src) + r * *src) >> 8;
 					*dst++;
 					*dst++ = 0;
 					src++;
@@ -88,3 +89,31 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 
 	return x;
 }
+
+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);
+	}
+}
+