Add a better framework for showing what's changed.

[ccbs] / bigscreen / fonts.cpp

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index b7a4cbd0c9463dc337c4b7cb59ce64b7ae90113d..2a7d2742ce6a663fcf8a7f9c3cdf1a4f9ab5d55e 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -14,16 +14,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 +27,19 @@ 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);
        }
 }
 
-int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b)
+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))
+                       throw std::runtime_error("Couldn't set font size");
+       }
 
        for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
                int glyph_index;
@@ -59,7 +58,7 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
                        continue;
                }
 
-               if (real_render) {
+               if (buf != NULL) {
                        int y;
                        FT_Bitmap *bm = &(slot->bitmap);
                        for (y = 0; y < bm->rows; y++) {
@@ -69,7 +68,9 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
                                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++) {
+
+                               int width = (x + xpos + slot->bitmap_left + bm->width >= 800) ? (799 - x - xpos - slot->bitmap_left) : bm->width;
+                               for (xx = 0; xx < width; xx++) {
                                        *dst = (*dst * (256-*src) + r * *src) >> 8;
                                        *dst++;
                                        *dst = (*dst * (256-*src) + g * *src) >> 8;
@@ -87,3 +88,31 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
        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);
+       }
+}
+