Let each screen get width and height in as a parameter on draw() instead of hardcodin...
[ccbs] / bigscreen / groupscreen.cpp
index 9d3b9e7..713c3b9 100644 (file)
@@ -36,11 +36,12 @@ bool GroupScreen::check_invalidated()
        return needs_update;
 }
 
-void GroupScreen::draw(unsigned char *buf)
+void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        std::vector<TextDefer> td;
        
        scores_changed.reset_flag();
+       set_screen_size(width, height);
 
        /*
         * We'll probably need some values from here later on (although not all), just fetch them
@@ -54,7 +55,7 @@ void GroupScreen::draw(unsigned char *buf)
        conn.perform(FetchGroup(tournament, round, parallel, &group));
        gettimeofday(&last_updated, NULL);
 
-       memset(buf, 0, SCREEN_WIDTH * SCREEN_HEIGHT * 4);
+       memset(buf, 0, width * height * 4);
 
        // main heading
        char heading[64];
@@ -80,40 +81,40 @@ void GroupScreen::draw(unsigned char *buf)
        // Find out how wide each column has to be. First try unlimited width (ie.
        // long titles for everything); if that gets too long, try again with short
        // titles for chosen songs.
-       unsigned width[16], num_scores;
+       unsigned colwidth[16], num_scores;
        unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
-       unsigned sumwidth;
+       unsigned sumcolwidth;
        for (unsigned mode = 0; mode < 2; ++mode) {
                for (unsigned i = 0; i < 16; ++i)
-                       width[i] = 0;
+                       colwidth[i] = 0;
 
                for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
                        unsigned col = 1;
-                       width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
+                       colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0));
 
                        for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
                                if (j->chosen) {
-                                       width[col] = std::max(width[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) + 
                                                        max_num_width + 10);
                                } else {                
-                                       width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0));
-                                       width[col] = std::max(width[col], max_num_width);
+                                       colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0));
+                                       colwidth[col] = std::max(colwidth[col], max_num_width);
                                }
                        }
                }
 
                num_scores = group.players[0].scores.size();
 
-               width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
-               width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
+               colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+               colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
 
                // if we're at long titles and that works, don't try the short ones
-               sumwidth = 0;
+               sumcolwidth = 0;
                        
                for (unsigned i = 0; i <= num_scores + 2; ++i)
-                       sumwidth += width[i] + 20;
+                       sumcolwidth += colwidth[i] + 20;
                        
-               if (sumwidth < 780)
+               if (sumcolwidth < 780)
                        break;
        }
 
@@ -121,7 +122,7 @@ void GroupScreen::draw(unsigned char *buf)
         * 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 (sumwidth < 780) {
+       if (sumcolwidth < 780) {
                int first_chosen_col = -1;
                unsigned col = 1;
 
@@ -133,24 +134,24 @@ void GroupScreen::draw(unsigned char *buf)
                }
 
                if (first_chosen_col != -1) {
-                       width[first_chosen_col] += 780 - sumwidth;
+                       colwidth[first_chosen_col] += 780 - sumcolwidth;
                }
        }
 
        // make column headings from the first player's songs
        unsigned col = 1;
-       unsigned x = 40 + width[0];
+       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 + width[col] / 2 - this_width / 2, 100);
+                       my_draw_text_deferred(td, i->song.short_title, 12.0, x + colwidth[col] / 2 - this_width / 2, 100);
                }
-               x += width[col] + 20;
+               x += colwidth[col] + 20;
        }
 
-       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_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
+       my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 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);
        
        // show all the players and the scores
        unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines;
@@ -164,7 +165,7 @@ void GroupScreen::draw(unsigned char *buf)
 
                my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
-               unsigned x = 40 + width[0];
+               unsigned x = 40 + colwidth[0];
 
                unsigned col = 1;
                for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
@@ -178,15 +179,15 @@ void GroupScreen::draw(unsigned char *buf)
                                my_draw_text_deferred(td, text, 22.0, 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) > (width[col] - 10 - max_num_width)) {
+                               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);
                                } 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);
+                               my_draw_text_deferred(td, text, 22.0, x + colwidth[col] / 2 - this_width / 2, y);
                        }
-                       x += width[col] + 20;
+                       x += colwidth[col] + 20;
                }
 
                // draw total
@@ -195,8 +196,8 @@ void GroupScreen::draw(unsigned char *buf)
                        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;
+                       my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 1] / 2 - this_width / 2, y);
+                       x += colwidth[num_scores + 1] + 20;
                }
 
                if (show_players > 7)
@@ -275,7 +276,7 @@ void GroupScreen::draw(unsigned char *buf)
                        continue;
                
                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);
+               my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y);
 
                if (show_players > 7)
                        y += 40 - (show_players - 7) * 4;