Shape text using Pango and HarfBuzz; gives us nice ligatures and exotic scripts.

[ccbs] / bigscreen / top10scorescreen.cpp

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 5e71bdd15704bf85b89b3d0b42b21f77425c02b0..2ac1cb0444afb58ff896270e71ddc4cfcdc25a29 100644 (file)
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -4,6 +4,13 @@
 #include "resolution.h"
 #include "top10scorescreen.h"
 #include "fonts.h"
+#include "theme.h"
+
+#define RANK_X 30
+#define PLAYER_X 70
+#define SONG_X 370
+#define SCORE_X (LOGICAL_SCREEN_WIDTH - 72)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 480)
 
 Top10ScoreScreen::Top10ScoreScreen(pqxx::connection &conn, unsigned tournament)
        : conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
@@ -20,6 +27,7 @@ bool Top10ScoreScreen::check_invalidated()
                return true;
        if (!scores_changed.get_flag())
                return false;
+       scores_changed.reset_flag();
 
        // check that there are indeed changes, otherwise don't bother
        std::vector<TopScore> scores;
@@ -27,17 +35,18 @@ bool Top10ScoreScreen::check_invalidated()
        
        for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
                if (seen_topscore.count(*i) == 0) {
+                       valid = false;
                        return true;
                }
        }
-       
+
        return false;
 }
 
 void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        scores_changed.reset_flag();
-       memset(buf, 0, width * height * 4);
+       fill_background(buf, "top10scorescreen", width, height);
        set_screen_size(width, height);
 
        // fetch the top 10 scores
@@ -45,40 +54,55 @@ void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
        conn.perform(FetchTopScoresForTournament(tournament, 10, &scores));
 
        {
-               unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-               my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+               unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0, "mainheading");
+               my_draw_text("Today's top 10 scores", buf, 40.0, "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
        }
 
        // simple headings
-       my_draw_text("Player", buf, 12.0, 70, 100);
-       my_draw_text("Song", buf, 12.0, 370, 100);
-       my_draw_text("Score", buf, 12.0, 710, 100);
+       my_draw_text("Player", buf, 12.0, "columnheading", PLAYER_X, 100);
+       my_draw_text("Song", buf, 12.0, "columnheading", SONG_X, 100);
+       width = my_draw_text("Score", NULL, 12.0, "columnheading");
+       my_draw_text("Score", buf, 12.0, "columnheading", SCORE_X - width/2, 100);
        
        unsigned row = 1, y = 140;
        for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+               std::string suffix;
+               if (row % 2 == 1) {
+                       suffix = ".odd";
+               } else {
+                       suffix = ".even";
+               }
+
                char str[16];
-               unsigned r = 255, g = 255, b = 255;
+               std::string heading_theme_element = "top10scores.rowheading" + suffix;
+               std::string nick_theme_element = "top10scores.nick" + suffix;
+               std::string songname_theme_element = "top10scores.songname" + suffix;
+               std::string frequency_theme_element = "top10scores.frequency" + suffix;
 
                // print new entries in red
                if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
-                       g = b = 0;
+                       heading_theme_element = "top10scores.freshrowheading" + suffix;
+                       nick_theme_element = "top10scores.freshnick" + suffix;
+                       songname_theme_element = "top10scores.freshsongname" + suffix;
+                       frequency_theme_element = "top10scores.freshfrequency" + suffix;
                }
 
                std::sprintf(str, "%u", row++);
-               unsigned width = my_draw_text(str, NULL, 24.0);
-               my_draw_text(str, buf, 24.0, 30 - width/2, y);
+               unsigned width = my_draw_text(str, NULL, 24.0, heading_theme_element);
+               my_draw_text(str, buf, 24.0, heading_theme_element, RANK_X - width/2, y);
 
-               my_draw_text(i->nick, buf, 24.0, 70, y, r, g, b);
+               my_draw_text(i->nick, buf, 24.0, nick_theme_element, PLAYER_X, y);
 
-               if (my_draw_text(i->title, NULL, 24.0) > 320) {
-                       my_draw_text(i->shorttitle, buf, 24.0, 370, y, r, g, b);
+               if (my_draw_text(i->title, NULL, 24.0, songname_theme_element) > SONG_MAX_WIDTH &&
+                   !i->shorttitle.empty()) {
+                       my_draw_text(i->shorttitle, buf, 24.0, songname_theme_element, SONG_X, y);
                } else {
-                       my_draw_text(i->title, buf, 24.0, 370, y, r, g, b);
+                       my_draw_text(i->title, buf, 24.0, songname_theme_element, SONG_X, y);
                }
                
                std::sprintf(str, "%u", i->score);
-               width = my_draw_text(str, NULL, 24.0);
-               my_draw_text(str, buf, 24.0, 728 - width/2, y, r, g, b);
+               width = my_draw_text(str, NULL, 24.0, frequency_theme_element);
+               my_draw_text(str, buf, 24.0, frequency_theme_element, SCORE_X - width/2, y);
 
                y += 40;
        }