Make a "logical resolution" (yuck!) of 800x600 for all the screens, and make fonts...

[ccbs] / bigscreen / fonts.cpp

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index e65e3564281ce3f26e7dd6f1924d8f1bb910b32c..aa61303b61a997223eaf6139a09845422bd2b58a 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -1,6 +1,7 @@
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"
 #include <vector>
 #include <stdexcept>
 #include "fonts.h"

+#include "resolution.h"

 
 std::vector<FT_Face> fonts;
 
 
 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) {
        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");
        }
 
                        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) {
        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,16 +69,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;
                        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;
                                unsigned char *src = bm->buffer + y * bm->width;

-                               for (xx = 0; xx < bm->width; xx++) {
-                                       *dst = (*dst * (256-*src) + r * *src) >> 8;
+
+                               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++;
                                        *dst = (*dst * (256-*src) + g * *src) >> 8;
                                        *dst++;
                                        *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++;
                                        *dst++;
                                        *dst++ = 0;
                                        src++;


@@ -84,5 +91,33 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
                x += slot->advance.x >> 6;
        }
 
                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);
+       }
+}
+