X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ffonts.cpp;h=8ceb87193b6cce7c9eae0dd228a56e4f698c9f39;hb=629352f0146f1e096bfe61cb604bbf848145f844;hp=2a7d2742ce6a663fcf8a7f9c3cdf1a4f9ab5d55e;hpb=88b3ef1f363e8181e7eb04e24f1646fe9782bb44;p=ccbs

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 2a7d274..8ceb871 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;
 
@@ -31,16 +32,28 @@ 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, 96))
+		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;
 		for (std::vector<FT_Face>::const_iterator j = fonts.begin(); j != fonts.end(); ++j) {
@@ -64,18 +77,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 > signed(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 >= signed(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++;
@@ -86,7 +99,7 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 		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)