Parametrize color scheme into a separate header file.

[ccbs] / bigscreen / fonts.cpp

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index df2360be5fc37436e1f005cf6aab9c4994093295..86910a6b2757a4c27974274eecc2b874fde95eb4 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -126,13 +126,19 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
        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)
+void my_draw_text_deferred(std::vector<TextDefer> &td, const widestring &str, double size, int xpos, int ypos, int r, int g, int b, int rn, int gn, int bn)
 {
        TextDefer newtd;
        newtd.str = str;
        newtd.size = size;
        newtd.xpos = xpos;
        newtd.ypos = ypos;
+       newtd.r = r;
+       newtd.g = g;
+       newtd.b = b;
+       newtd.rn = rn;
+       newtd.gn = gn;
+       newtd.bn = bn;
        td.push_back(newtd);
 }
 
@@ -142,11 +148,13 @@ void draw_all_deferred_text(unsigned char *buf, std::vector<TextDefer> &current,
                int r, g, b;
                if (i < old.size() && current[i].str != old[i].str) {
                        // changed text
-                       r = 255;
-                       g = 0;
-                       b = 0;
+                       r = current[i].rn;
+                       g = current[i].gn;
+                       b = current[i].bn;
                } else {
-                       r = g = b = 255;
+                       r = current[i].r;
+                       g = current[i].g;
+                       b = current[i].b;
                }       
                
                my_draw_text(current[i].str, buf, current[i].size, current[i].xpos, current[i].ypos, r, g, b);