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

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 8ba809f..aa61303 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;
 
@@ -37,10 +38,14 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 	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,12 +69,12 @@ 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) + b * *src) >> 8;
 					*dst++;
@@ -86,7 +91,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)