Clamp number of players shown to nine. Squeeze players a bit more together when we...

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index cd6c86edccdb596660452a30fbd2096de61ae758..6d38c4cca58e45102a459ddb982a749d24c2deae 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -49,9 +49,9 @@ void GroupScreen::draw(unsigned char *buf)
        // main heading
        char heading[64];
        if (parallel == 0) {
-               sprintf(heading, "Round %u", round);
+               std::sprintf(heading, "Round %u", round);
        } else {
-               sprintf(heading, "Round %u, Group %u", round, parallel);
+               std::sprintf(heading, "Round %u, Group %u", round, parallel);
        }
 
        {
@@ -64,8 +64,8 @@ void GroupScreen::draw(unsigned char *buf)
        // titles for chosen songs.
        unsigned width[16], num_scores;
        unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
-       unsigned mode, sumwidth;
-       for (mode = 0; mode < 2; ++mode) {
+       unsigned sumwidth;
+       for (unsigned mode = 0; mode < 2; ++mode) {
                for (unsigned i = 0; i < 16; ++i)
                        width[i] = 0;
 
@@ -115,7 +115,6 @@ void GroupScreen::draw(unsigned char *buf)
                }
 
                if (first_chosen_col != -1) {
-                       printf("first_chosen_col=%u\n", first_chosen_col);
                        width[first_chosen_col] += 780 - sumwidth;
                }
        }
@@ -136,8 +135,11 @@ void GroupScreen::draw(unsigned char *buf)
        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) {
+       unsigned show_players = std::min(group.players.size(), 9U);
+       unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+       
+       unsigned row = 0;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i, ++row) {
                my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
                unsigned x = 40 + width[0];
@@ -146,13 +148,19 @@ void GroupScreen::draw(unsigned char *buf)
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                        char text[16] = "";
                        if (j->score != -1) {
-                               sprintf(text, "%u", j->score);
+                               std::sprintf(text, "%u", j->score);
                        }
        
                        unsigned this_width = my_draw_text(text, NULL, 22.0);
                        if (j->chosen) {
                                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);
+
+                               // draw the long name if we can, otherwise use the short one
+                               if (my_draw_text(j->song.title, NULL, 12.0) > width[col]) {
+                                       my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y);
+                               } else {
+                                       my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y);
+                               }
                        } else {
                                my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y);
                        }
@@ -162,14 +170,17 @@ void GroupScreen::draw(unsigned char *buf)
                // draw total
                {
                        char text[16];
-                       sprintf(text, "%u", i->total);
+                       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 + width[num_scores + 1] / 2 - this_width / 2, y);
                        x += width[num_scores + 1] + 20;
                }
 
-               y += 40;
+               if (show_players > 7)
+                       y += 40 - (show_players - 7) * 4;
+               else 
+                       y += 40;
        }
        
        /*
@@ -219,8 +230,8 @@ void GroupScreen::draw(unsigned char *buf)
        }
 
        // now finally find min and max rank, and draw it all
-       y = 140;
-       for (unsigned i = 0; i < group.players.size(); ++i) {
+       y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+       for (unsigned i = 0; i < show_players; ++i) {
                unsigned best_rank = 1, worst_rank = 1;
                for (unsigned j = 0; j < group.players.size(); ++j) {
                        if (i == j)
@@ -241,7 +252,10 @@ void GroupScreen::draw(unsigned char *buf)
                unsigned this_width = my_draw_text(text, NULL, 22.0);
                my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y);
 
-               y += 40;
+               if (show_players > 7)
+                       y += 40 - (show_players - 7) * 4;
+               else 
+                       y += 40;
        }
                
        /*
@@ -289,7 +303,6 @@ void GroupScreen::draw(unsigned char *buf)
                unsigned j = (i + next_player->position - 1) % num_random_songs;
                if (next_player->scores[j].score == -1) {
                        next_song = &(next_player->scores[j]);
-                       printf("Selecting score %u\n", j);
                        break;
                }
        }
@@ -300,7 +313,6 @@ void GroupScreen::draw(unsigned char *buf)
                        unsigned j = (i + next_player->position) % num_scores;
                        if (next_player->scores[j].score == -1) {
                                next_song = &(next_player->scores[j]);
-                               printf("Selecting score %u\n", j);
                                break;
                        }
                }