Add a better framework for showing what's changed.
authorSteinar H. Gunderson <sesse@samfundet.no>
Sun, 20 Feb 2005 14:22:11 +0000 (14:22 +0000)
committerSteinar H. Gunderson <sesse@samfundet.no>
Sun, 20 Feb 2005 14:22:11 +0000 (14:22 +0000)
bigscreen/fonts.cpp
bigscreen/fonts.h
bigscreen/groupscreen.cpp
bigscreen/groupscreen.h

index a2ac91b..2a7d274 100644 (file)
@@ -88,3 +88,31 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, in
 
        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);
+       }
+}
+
index fe43c58..b465aa1 100644 (file)
@@ -6,7 +6,19 @@
 #include <vector>
 #include "widestring.h"
 
+struct TextDefer {
+       widestring str;
+       double size;
+       unsigned xpos, ypos;
+
+       bool changed;
+};
+
 void init_freetype();
 unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, int xpos = 0, int ypos = 0, int r = 255, int g = 255, int b = 255);
 
+// draw_all_deferred_text draws every string in current that is not the same in old, in red
+void my_draw_text_deferred(std::vector<TextDefer> &td, const widestring &str, double size, int xpos, int ypos);
+void draw_all_deferred_text(unsigned char *buf, std::vector<TextDefer> &current, std::vector<TextDefer> &old);
+
 #endif /* !defined(_FONTS_H) */
index 7e45628..aca0780 100644 (file)
@@ -35,6 +35,8 @@ bool GroupScreen::check_invalidated()
 
 void GroupScreen::draw(unsigned char *buf)
 {
+       std::vector<TextDefer> td;
+       
        scores_changed.reset_flag();
 
        Group group;
@@ -53,7 +55,7 @@ void GroupScreen::draw(unsigned char *buf)
 
        {
                unsigned width = my_draw_text(heading, NULL, 48.0);
-               my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
+               my_draw_text_deferred(td, heading, 48.0, 800/2 - width/2, 60);
        }
        
        // Find out how wide each column has to be. First try unlimited width (ie.
@@ -103,19 +105,19 @@ void GroupScreen::draw(unsigned char *buf)
        for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
                if (!i->chosen) {
                        unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0);
-                       my_draw_text(i->song.short_title, buf, 12.0, x + width[col] / 2 - this_width / 2, 100);
+                       my_draw_text_deferred(td, i->song.short_title, 12.0, x + width[col] / 2 - this_width / 2, 100);
                }
                x += width[col] + 20;
        }
 
-       my_draw_text("Total", buf, 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+       my_draw_text_deferred(td, "Total", 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
        x += width[num_scores + 1] + 20;
-       my_draw_text("Rank", buf, 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
+       my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
        
        // show all the players and the scores
        unsigned y = 140;
        for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               my_draw_text(i->nick, buf, 18.0, 20, y);
+               my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
                unsigned x = 40 + width[0];
 
@@ -128,10 +130,10 @@ void GroupScreen::draw(unsigned char *buf)
        
                        unsigned this_width = my_draw_text(text, NULL, 22.0);
                        if (j->chosen) {
-                               my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
-                               my_draw_text((mode == 0) ? j->song.title : j->song.short_title, buf, 12.0, x + max_num_width + 10, y);
+                               my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y);
+                               my_draw_text_deferred(td, (mode == 0) ? j->song.title : j->song.short_title, 12.0, x + max_num_width + 10, y);
                        } else {
-                               my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
+                               my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y);
                        }
                        x += width[col] + 20;
                }
@@ -142,7 +144,7 @@ void GroupScreen::draw(unsigned char *buf)
                        sprintf(text, "%u", i->total);
                        
                        unsigned this_width = my_draw_text(text, NULL, 22.0);
-                       my_draw_text(text, buf, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
+                       my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
                        x += width[num_scores + 1] + 20;
                }
 
@@ -216,11 +218,13 @@ void GroupScreen::draw(unsigned char *buf)
                        std::sprintf(text, "%u-%u", best_rank, worst_rank);
                
                unsigned this_width = my_draw_text(text, NULL, 22.0);
-               my_draw_text(text, buf, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
+               my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 
                y += 40;
        }
                
        valid = true;
+       draw_all_deferred_text(buf, td, last_text);
+       last_text = td;
 }
 
index 7297975..3d24403 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef _GROUPSCREEN_H
 #define _GROUPSCREEN_H 1
 
+#include <vector>
 #include <pqxx/connection>
 #include <time.h>
 #include <sys/time.h>
@@ -8,6 +9,7 @@
 #include "screen.h"
 #include "flagtrigger.h"
 #include "group.h"
+#include "fonts.h"
 
 /* A screen class showing a group in the tournament */
 class GroupScreen : public GenericScreen {
@@ -17,6 +19,7 @@ private:
        pqxx::connection &conn;
        bool valid;
        struct timeval last_updated;
+       std::vector<TextDefer> last_text;
 
 public:
        GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel);