]> git.sesse.net Git - ccbs/blobdiff - bigscreen/groupscreen.cpp
There is no freshcolumnheading.
[ccbs] / bigscreen / groupscreen.cpp
index b2a63159540810fcd1f3d6be6202fc3b44d735e2..9f3b17c521eac7ff9c42b406a7511cfd0839ba0c 100644 (file)
 #include "fetch_needs_update.h"
 #include "fetch_highscore.h"
 #include "fonts.h"
+#include "theme.h"
+
+std::string theme_suffix_from_row(unsigned row)
+{
+       if (row % 2 == 0) {
+               return ".odd";  // :-)
+       } else {
+               return ".even";
+       }
+}
 
 GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines, unsigned players_per_machine)
        : tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), players_per_machine(players_per_machine), scores_changed(conn, "scores"), conn(conn), valid(false)
@@ -27,13 +37,12 @@ bool GroupScreen::check_invalidated()
                return true;
        if (!scores_changed.get_flag())
                return false;
+       scores_changed.reset_flag();
 
        bool needs_update;
        conn.perform(FetchNeedsUpdate(last_updated, tournament, round, parallel, &needs_update));
 
-       if (!needs_update)
-               scores_changed.reset_flag();
-       
+       valid = !needs_update;
        return needs_update;
 }
 
@@ -60,8 +69,8 @@ void GroupScreen::draw_main_heading(std::vector<TextDefer> &td)
                }
        }
 
-       unsigned width = my_draw_text(heading, NULL, 40.0);
-       my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+       unsigned width = my_draw_text(heading, NULL, 40.0, "mainheading");
+       my_draw_text_deferred(td, heading, 40.0, "mainheading", "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
 }
 
 // make column headings from the first player's songs
@@ -72,24 +81,26 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
        unsigned col = 1;
        unsigned x = 40 + colwidth[0];
        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_deferred(td, i->song.short_title, 12.0, x + colwidth[col] / 2 - this_width / 2, 100);
-               }
-               x += colwidth[col] + 20;
+               if (!i->chosen) {
+                       unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading");
+                       my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100);
+               }
+               x += colwidth[col] + 20;
        }
 
        if (num_scores > 1) {
-               my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+               unsigned this_width = my_draw_text("Total", NULL, 12.0, "columnheading");
+               my_draw_text_deferred(td, "Total", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 1] / 2 - this_width / 2, 100);
                x += colwidth[num_scores + 1] + 20;
        }
-       my_draw_text_deferred(td, "Rank", 12.0, x + colwidth[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
+       unsigned this_width = my_draw_text("Rank", NULL, 12.0, "columnheading");
+       my_draw_text_deferred(td, "Rank", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 2] / 2 - this_width / 2, 100);
 }      
        
 // show all the players and the scores
 void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, unsigned min_player, const std::vector<unsigned> &colwidth)
 {
-       unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "score");
        unsigned num_scores = group.players[0].scores.size();
        unsigned show_players = get_show_players(group);
        unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
@@ -101,7 +112,9 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
                if (m-1 < min_player)
                        continue;
 
-               my_draw_text_deferred(td, i->nick, 18.0, 20, y);
+               std::string suffix = theme_suffix_from_row(row);
+
+               my_draw_text_deferred(td, i->nick, 18.0, "rowheading" + suffix, "rowheading" + suffix, 20, y);
 
                x = 40 + colwidth[0];
 
@@ -112,18 +125,18 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
                                std::sprintf(text, "%u", j->score);
                        }
        
-                       unsigned this_width = my_draw_text(text, NULL, 22.0);
+                       unsigned this_width = my_draw_text(text, NULL, 22.0, "score" + suffix);
                        if (j->chosen) {
-                               my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y);
+                               my_draw_text_deferred(td, text, 22.0, "score" + suffix, "freshscore" + suffix, x + max_num_width - this_width, y);
 
                                // draw the long name if we can, otherwise use the short one
-                               if (my_draw_text(j->song.title, NULL, 12.0) > (colwidth[col] - 10 - max_num_width)) {
-                                       my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y);
+                               if (my_draw_text(j->song.title, NULL, 12.0, "chosensongname") > (colwidth[col] - 10 - max_num_width)) {
+                                       my_draw_text_deferred(td, j->song.short_title, 12.0, "chosensongname" + suffix, "freshchosensongname" + suffix, x + max_num_width + 10, y);
                                } else {
-                                       my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y);
+                                       my_draw_text_deferred(td, j->song.title, 12.0, "chosensongname" + suffix, "freshchosensongname" + suffix, x + max_num_width + 10, y);
                                }
                        } else {
-                               my_draw_text_deferred(td, text, 22.0, x + colwidth[col] / 2 - this_width / 2, y);
+                               my_draw_text_deferred(td, text, 22.0, "score" + suffix, "freshscore" + suffix, x + colwidth[col] / 2 - this_width / 2, y);
                        }
                        x += colwidth[col] + 20;
                }
@@ -133,8 +146,8 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
                        char text[16];
                        std::sprintf(text, "%u", i->total);
                        
-                       unsigned this_width = my_draw_text(text, NULL, 22.0);
-                       my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 1] / 2 - this_width / 2, y);
+                       unsigned this_width = my_draw_text(text, NULL, 22.0, "totalscore" + suffix);
+                       my_draw_text_deferred(td, text, 22.0, "totalscore" + suffix, "freshtotalscore" + suffix, x + colwidth[num_scores + 1] / 2 - this_width / 2, y);
                        x += colwidth[num_scores + 1] + 20;
                }
 
@@ -154,7 +167,7 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
 void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &colwidth)
 {
        unsigned num_scores;
-       unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "score");
        unsigned sumcolwidth;
        
        for (unsigned mode = 0; mode < 2; ++mode) {
@@ -164,17 +177,17 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
                        if (colwidth.size() == 0)
                                colwidth.push_back(0);
                        
-                       colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0));
+                       colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "rowheading"));
 
                        for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                                if (colwidth.size() < col+1)
                                        colwidth.push_back(0);
                                        
                                if (j->chosen) {
-                                       colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + 
+                                       colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0, "chosensongname") + 
                                                        max_num_width + 10);
                                } else {                
-                                       colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0));
+                                       colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0, "randomsongname"));
                                        colwidth[col] = std::max(colwidth[col], max_num_width);
                                }
                        }
@@ -188,9 +201,9 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
                }
        
                if (num_scores > 1) {
-                       colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+                       colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0, "columnheading"), max_num_width);
                }
-               colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
+               colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0, "columnheading");
 
                // if we're at long titles and that works, don't try the short ones
                sumcolwidth = 0;
@@ -198,7 +211,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
                for (unsigned i = 0; i <= num_scores + 2; ++i)
                        sumcolwidth += colwidth[i] + 20;
                
-               if (sumcolwidth < 780)
+               if (sumcolwidth < LOGICAL_SCREEN_WIDTH - 20)
                        break;
 
                if (mode == 0) {
@@ -210,7 +223,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
         * If we have space to go, distribute as much as we can to the chosen song column, so we won't have
         * total and rank jumping around.
         */
-       if (sumcolwidth < 780) {
+       if (sumcolwidth < LOGICAL_SCREEN_WIDTH - 20) {
                int first_chosen_col = -1;
                unsigned col = 1;
 
@@ -222,7 +235,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
                }
 
                if (first_chosen_col != -1) {
-                       colwidth[first_chosen_col] += 780 - sumcolwidth;
+                       colwidth[first_chosen_col] += LOGICAL_SCREEN_WIDTH - 20 - sumcolwidth;
                }
        }
 }
@@ -407,12 +420,12 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group,
        
        // OK, we have two players. Draw their nicks and the scores
        widestring text = widestring("Next players: ") + next_player->nick + widestring(" and ") + other_player->nick;
-       unsigned this_width = my_draw_text(text, NULL, 24.0);
-       my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+       unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player");
+       my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
 
        if (next_song->song.id != -1) {
-               this_width = my_draw_text(next_song->song.title, NULL, 20.0);
-               my_draw_text(next_song->song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+               this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsonginfo.title");
+               my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
 
                Highscore hs;
                conn.perform(FetchHighscore(next_song->song.id, &hs));
@@ -420,8 +433,8 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group,
                if (hs.score != -1) {
                        text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) +
                                widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name;
-                       this_width = my_draw_text(text, NULL, 16.0);
-                       my_draw_text(text, buf, 16.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+                       this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore");
+                       my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
                }
        }
 }
@@ -431,12 +444,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
        const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
 {
        widestring text = widestring("Next player: ") + player.nick;
-       unsigned this_width = my_draw_text(text, NULL, 24.0);
-       my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+       unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player");
+       my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
 
        if (song.song.id != -1) {
-               this_width = my_draw_text(song.song.title, NULL, 20.0);
-               my_draw_text(song.song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+               this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo.title");
+               my_draw_text(song.song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
 
                Highscore hs;
                conn.perform(FetchHighscore(song.song.id, &hs));
@@ -444,8 +457,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                if (hs.score != -1) {
                        text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) +
                                widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name;
-                       this_width = my_draw_text(text, NULL, 16.0);
-                       my_draw_text(text, buf, 16.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+                       this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore");
+                       my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
                }
        }
 
@@ -521,7 +534,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                                tmp.push_back(max_score[i]);
                        }
                        std::sort(tmp.begin(), tmp.end());
-                       qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying];
+                       if (tmp.size() > group.num_qualifying) {
+                               qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying];
+                       } else {
+                               qualify_beat_worst_case = 0;
+                       }
 
                        std::vector<unsigned> tmp2;
                        for (unsigned i = 0; i < group.players.size(); ++i) {
@@ -531,7 +548,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                        }
 
                        std::sort(tmp2.begin(), tmp2.end());
-                       qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying];
+                       if (tmp2.size() > group.num_qualifying) {
+                               qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying];
+                       } else {
+                               qualify_beat_best_case = 0;
+                       }
                }
 
                // print out the lines we can attain
@@ -540,8 +561,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 
                        if (lead_need > 1) {
                                text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -553,8 +574,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                        if (win_need > 0) {
                                text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
 
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -573,8 +594,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                                        text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
                                }
 
-                               this_width = my_draw_text(text, NULL, 18.0);
-                               my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -602,7 +623,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
        conn.perform(FetchGroup(tournament, round, parallel, &group));
        gettimeofday(&last_updated, NULL);
 
-       memset(buf, 0, width * height * 4);
+       fill_background(buf, "groupscreen", width, height);
 
        std::vector<unsigned> colwidth;
        
@@ -682,6 +703,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
        
        // now finally find min and max rank, and draw it all
        unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+       unsigned row = 0;
        for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players+min_player; ++i) {
                unsigned best_rank = 1, worst_rank = 1;
                for (unsigned j = 0; j < group.players.size(); ++j) {
@@ -705,6 +727,8 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
                if (signed(i) < min_player)
                        continue;
                
+               std::string suffix = theme_suffix_from_row(row);
+
                // find out where to place this
                unsigned x = 40 + colwidth[0];
                for (unsigned j = 1; j <= num_scores + 1; ++j)
@@ -714,13 +738,15 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
                if (num_scores <= 1)
                        x -= 20;
                
-               unsigned this_width = my_draw_text(text, NULL, 22.0);
-               my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y);
+               unsigned this_width = my_draw_text(text, NULL, 22.0, "rank" + suffix);
+               my_draw_text_deferred(td, text, 22.0, "rank" + suffix, "freshrank" + suffix, x + colwidth[num_scores + 2] / 2 - this_width / 2, y);
 
                if (show_players > 7)
                        y += 40 - (show_players - 7) * 4;
                else 
                        y += 40;
+
+               ++row;
        }
 
        if (players_per_machine == 2)