]> git.sesse.net Git - ccbs/blobdiff - bigscreen/groupscreen.cpp
Yet more refactoring.
[ccbs] / bigscreen / groupscreen.cpp
index 2b4aa7d7369160b42ec0275c616451eb4caefb89..03b61db2f32e38cbf65e99808fee0646d96c943b 100644 (file)
@@ -1,15 +1,18 @@
 #include <cstdio>
 #include <algorithm>
+#include <map>
 
+#include "resolution.h"
 #include "groupscreen.h"
 #include "fetch_group.h"
-#include "fetch_max_score_for_song.h"
-#include "fetch_max_score_for_player.h"
+#include "fetch_max_score_for_songs.h"
+#include "fetch_max_score_for_players.h"
 #include "fetch_needs_update.h"
+#include "fetch_highscore.h"
 #include "fonts.h"
 
-GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel)
-       : tournament(tournament), round(round), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
+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)
 {
 }
 
@@ -33,263 +36,255 @@ bool GroupScreen::check_invalidated()
        return needs_update;
 }
 
-void GroupScreen::draw(unsigned char *buf)
+unsigned GroupScreen::get_show_players(const Group &group)
 {
-       std::vector<TextDefer> td;
-       
-       scores_changed.reset_flag();
-
-       Group group;
-       conn.perform(FetchGroup(tournament, round, parallel, &group));
-       gettimeofday(&last_updated, NULL);
-
-       memset(buf, 0, 800 * 600 * 4);
+       unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines;
+       return std::min(num_players_this_machine, 9U);
+}
 
-       // main heading
+void GroupScreen::draw_main_heading(std::vector<TextDefer> &td)
+{
        char heading[64];
-       if (parallel == 0) {
-               sprintf(heading, "Round %u", round);
+       if (num_machines == 1) {
+               if (parallel == 0) {
+                       std::sprintf(heading, "Round %u", round);
+               } else {
+                       std::sprintf(heading, "Round %u, Group %u", round, parallel);
+               }
        } else {
-               sprintf(heading, "Round %u, Group %u", round, parallel);
-       }
-
-       {
-               unsigned width = my_draw_text(heading, NULL, 48.0);
-               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.
-       // long titles for everything); if that gets too long, try again with short
-       // 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) {
-               for (unsigned i = 0; i < 16; ++i)
-                       width[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));
-
-                       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) + 
-                                                       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);
-                               }
-                       }
+               if (parallel == 0) {
+                       std::sprintf(heading, "Round %u, Machine %u", round, machine + 1);
+               } else {
+                       std::sprintf(heading, "Round %u, Group %u, Machine %u", round, parallel, machine + 1);
                }
-
-               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);
-
-               // if we're at long titles and that works, don't try the short ones
-               sumwidth = 0;
-                       
-               for (unsigned i = 0; i <= num_scores + 2; ++i)
-                       sumwidth += width[i] + 20;
-                       
-               if (sumwidth < 780)
-                       break;
        }
 
-       /* 
-        * 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) {
-               int first_chosen_col = -1;
-               unsigned col = 1;
-
-               for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
-                       if (i->chosen) {
-                               first_chosen_col = col;
-                               break;
-                       }
-               }
+       unsigned width = my_draw_text(heading, NULL, 40.0);
+       my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+}
 
-               if (first_chosen_col != -1) {
-                       printf("first_chosen_col=%u\n", first_chosen_col);
-                       width[first_chosen_col] += 780 - sumwidth;
-               }
-       }
+// make column headings from the first player's songs
+void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth)
+{
+       unsigned num_scores = group.players[0].scores.size();
 
-       // 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 y = 140;
-       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+// show all the players and the scores
+void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth)
+{
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
+       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);
+       
+       unsigned row = 0, m = 0, x;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) {
+               if (m++ % num_machines != machine)
+                       continue;
+
                my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
-               unsigned x = 40 + width[0];
+               x = 40 + colwidth[0];
 
                unsigned col = 1;
                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) > (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
                {
                        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;
+                       my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 1] / 2 - this_width / 2, y);
+                       x += colwidth[num_scores + 1] + 20;
                }
 
-               y += 40;
+               if (show_players > 7)
+                       y += 40 - (show_players - 7) * 4;
+               else 
+                       y += 40;
+               ++row;
        }
+}      
+
+/*
+ * 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.
+ */
+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 sumcolwidth;
        
-       /*
-        * Approximate (but probably working quite well in practice) heuristic
-        * for finding the min and max rank of a player works as follows:
-        *
-        * First of all, find out, for each player in the group, what the
-        * maximum remaining score possibly can be (the minimum score is of
-        * course identical to the player's current total). For a random song,
-        * this is of course 1000 * (maximum feet rating) (but of course, that
-        * depends on whether we can play single or double! for now, assume
-        * double is okay, but this logic will be deferred to FetchMaxScore
-        * anyhow); for a random song, we simply pick the highest-ranking song
-        * we can find, EXCEPT those the player has chosen earlier AND the
-        * random songs this round, AND all random songs from elimination rounds
-        * (ie. rounds with only one group). (Phew!) This doesn't solve problems
-        * we'd face with more than one chosen song, but it should be good enough.
-        *
-        * After we've found the max and min scores for all players, it's a simple
-        * matter of sorting; the best attainable rank for player X is obtained if 
-        * X gets max score and all others get min score, the worst attainable rank
-        * is obtained if X gets min score and all others get max score.
-        *
-        * This is a bit SQL-heavy, but heck...
-        */
-       std::vector<unsigned> max_score, min_score;
-       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               unsigned min_score_tp = 0, max_score_tp = 0;
-               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
-                       if (j->score != -1) {
-                               // already given
-                               min_score_tp += j->score;
-                               max_score_tp += j->score;
-                       } else {
-                               unsigned max_score_this_song;
-                               if (j->song.id != -1) {
-                                       // random song, or we know what song the player picked
-                                       conn.perform(FetchMaxScoreForSong(tournament, j->song.id, &max_score_this_song));
-                               } else {
-                                       conn.perform(FetchMaxScoreForPlayer(tournament, i->id, round, &max_score_this_song));
+       for (unsigned mode = 0; mode < 2; ++mode) {
+               for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+                       unsigned col = 1;
+                       
+                       if (colwidth.size() == 0)
+                               colwidth.push_back(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 (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) + 
+                                                       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], max_num_width);
                                }
-                               max_score_tp += max_score_this_song;
                        }
                }
-               max_score.push_back(max_score_tp);
-               min_score.push_back(min_score_tp);
-       }
 
-       // now finally find min and max rank, and draw it all
-       y = 140;
-       for (unsigned i = 0; i < group.players.size(); ++i) {
-               unsigned best_rank = 1, worst_rank = 1;
-               for (unsigned j = 0; j < group.players.size(); ++j) {
-                       if (i == j)
-                               continue;
+               num_scores = group.players[0].scores.size();
 
-                       if (max_score[i] < min_score[j])
-                               ++best_rank;
-                       if (min_score[i] <= max_score[j])
-                               ++worst_rank;
+               if (colwidth.size() < num_scores + 2) {
+                       colwidth.push_back(0);
+                       colwidth.push_back(0);
                }
-
-               char text[16];
-               if (best_rank == worst_rank)
-                       std::sprintf(text, "%u", best_rank);
-               else
-                       std::sprintf(text, "%u-%u", best_rank, worst_rank);
                
-               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);
+               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);
 
-               y += 40;
+               // if we're at long titles and that works, don't try the short ones
+               sumcolwidth = 0;
+                       
+               for (unsigned i = 0; i <= num_scores + 2; ++i)
+                       sumcolwidth += colwidth[i] + 20;
+                       
+               if (sumcolwidth < 780)
+                       break;
        }
-               
-       /*
-        * Next up (at the bottom) is "who's playing, what will he/she be playing, and
-        * optionally, how much to lead/win and how much to secure qualification" (the
-        * last one only in the final round). We assume playing is done in a modified
-        * zigzag; all the random songs are played first in zigzag/wrapping order (player
-        * 1 song 1, player 2 song 2, player 3 song 3, player 1 song 2, player 2 song 3,
-        * player 3 song 1, etc... assuming three songs and three players) and then all
-        * the chosen songs are played (we assume only one chosen song).
-        *
-        * The lines are as follows:
-        *
-        * <player>
-        * <song>
-        * High score: <hs> by <hsplayer> at <hsevent>
-        * Needs to lead: <leadscore>
-        * Needs to secure qualification: <qualscore>
-        * Needs to win group: <winscore>
+
+       /* 
+        * 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.
         */
-       
-       /* Find the first player with the fewest songs played. */
-       unsigned min_played_songs = 9999, num_random_songs = 0;
-       Player *next_player = NULL;
-       for (std::vector<Player>::iterator i = group.players.begin(); i != group.players.end(); ++i) {
-               unsigned this_played = 0, this_random_songs = 0;
-               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+       if (sumcolwidth < 780) {
+               int first_chosen_col = -1;
+               unsigned col = 1;
+
+               for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
+                       if (i->chosen) {
+                               first_chosen_col = col;
+                               break;
+                       }
+               }
+
+               if (first_chosen_col != -1) {
+                       colwidth[first_chosen_col] += 780 - sumcolwidth;
+               }
+       }
+}
+
+/* Find the first player with the fewest songs played and part of this machine. */
+const Player *GroupScreen::get_next_player(const Group &group)
+{
+       unsigned min_played_songs = 9999;
+       const Player *next_player = NULL;
+       unsigned m = 0;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+               unsigned this_played = 0;
+               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
                        if (j->score != -1)
                                ++this_played;
-                       if (!j->chosen)
-                               ++this_random_songs;
                }
 
-               if (this_played < min_played_songs) {
+               if ((m++ % num_machines == machine) && this_played < min_played_songs) {
                        min_played_songs = this_played;
                        next_player = &(*i);
-                       num_random_songs = this_random_songs;  // should be equal for all
                }
        }
 
-       /* Find out what song this player is supposed to play next; try random songs first */ 
-       Score *next_song = NULL;
+       return next_player;
+}
+
+/*
+ * At the bottom, for a single player, is "who's playing, what will he/she be
+ * playing, and optionally, how much to lead/win and how much to secure
+ * qualification" (the last one only in the final round). We assume playing is
+ * done in a modified zigzag; all the random songs are played first in
+ * zigzag/wrapping order (player 1 song 1, player 2 song 2, player 3 song 3,
+ * player 1 song 2, player 2 song 3, player 3 song 1, etc... assuming three
+ * songs and three players) and then all the chosen songs are played (we assume
+ * only one chosen song).
+ *
+ * The lines are as follows:
+ *
+ * <player>
+ * <song>
+ * High score: <hs> by <hsplayer> at <hsevent>
+ * Needs to lead: <leadscore>
+ * Needs to secure qualification: <qualscore>
+ * Needs to win group: <winscore>
+ */
+void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, const std::vector<unsigned> &colwidth,
+       std::map<unsigned, unsigned> &song_scores, std::map<unsigned, unsigned> &player_scores,
+       const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
+{
+        unsigned num_scores = group.players[0].scores.size();
+       
+       // Find out how many random songs there are (equal for all players).
+       unsigned num_random_songs = 0;
+       for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i) {
+               if (!i->chosen)
+                       ++num_random_songs;
+       }
+
+       /* 
+        * Find out which player is next, and what song he she is supposed to play. First
+        * try random songs.
+        */
+       const Player *next_player = get_next_player(group);
+       const Score *next_song = NULL;
+       unsigned num_played = 0;  // will not always be completely accurate, but always as accurate as we need it :-)
 
        for (unsigned i = 0; i < num_random_songs; ++i) {
                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;
+               } else {
+                       ++num_played;
                }
        }
 
@@ -299,8 +294,9 @@ 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;
+                       } else {
+                               ++num_played;
                        }
                }
        }
@@ -308,21 +304,25 @@ void GroupScreen::draw(unsigned char *buf)
        if (next_song != NULL) {
                widestring text = widestring("Next player: ") + next_player->nick;
                unsigned this_width = my_draw_text(text, NULL, 24.0);
-               my_draw_text(text, buf, 24.0, 400 - this_width/2, 420);
+               my_draw_text(text, buf, 24.0, (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, 400 - this_width/2, 457);
+                       my_draw_text(next_song->song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
 
-                       // fetch the high score later
-                       text = widestring("High score: ") + widestring(pqxx::to_string(1234)) +
-                               widestring(", by dufF in Challenge Cup 1, 2004");
-                       this_width = my_draw_text(text, NULL, 16.0);
-                       my_draw_text(text, buf, 16.0, 400 - this_width/2, 487);
+                       Highscore hs;
+                       conn.perform(FetchHighscore(next_song->song.id, &hs));
+                       
+                       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);
+                       }
                }
 
                // only show lead/win/qualify for the last song
-               if (min_played_songs == num_scores - 1) {
+               if (num_played == num_scores - 1) {
                        /*
                         * Find out how much we need to lead, how much we need to be guaranteed
                         * to win the group, and how much we need to secure qualification. (FIXME:
@@ -333,9 +333,9 @@ void GroupScreen::draw(unsigned char *buf)
                        unsigned max_score_this_song;
                        if (next_song->song.id != -1) {
                                // random song, or we know what song the player picked
-                               conn.perform(FetchMaxScoreForSong(tournament, next_song->song.id, &max_score_this_song));
+                               max_score_this_song = song_scores[next_song->song.id];
                        } else {
-                               conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song));
+                               max_score_this_song = player_scores[next_player->id];
                        }
 
                        unsigned y = 520;
@@ -410,44 +410,172 @@ void GroupScreen::draw(unsigned char *buf)
                        // print out the lines we can attain
                        if (next_player->total + max_score_this_song > lead_beat && (lead_beat != win_beat)) {
                                int lead_need = std::max(lead_beat - next_player->total + 1, 0U);
-                               
-                               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, 400 - this_width/2, y);
+                       
+                               if (lead_need > 0) {
+                                       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);
 
-                               y += 30;
+                                       y += 30;
+                               }
                        }
                        
                        if (next_player->total + max_score_this_song > win_beat) {
                                int win_need = std::max(win_beat - next_player->total + 1, 0U);
                                
-                               text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
+                               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, 400 - this_width/2, y);
+                                       this_width = my_draw_text(text, NULL, 18.0);
+                                       my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
-                               y += 30;
+                                       y += 30;
+                               }
                        }
 
-                       if (next_player->total + max_score_this_song > qualify_beat_worst_case && (qualify_beat_worst_case != win_beat)) {
+                       if (group.num_qualifying > 0 &&
+                           next_player->total + max_score_this_song > unsigned(qualify_beat_worst_case) &&
+                           (unsigned(qualify_beat_worst_case) != win_beat)) {
                                int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U);
                                
-                               if (qualify_beat_worst_case == qualify_beat_best_case) {
-                                       text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need));
-                               } else {
-                                       text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
-                               }
+                               if (qual_need > 0) {
+                                       if (qualify_beat_worst_case == qualify_beat_best_case) {
+                                               text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need));
+                                       } else {
+                                               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);
-                               my_draw_text(text, buf, 18.0, 400 - this_width/2, y);
+                                       y += 30;
+                               }
+                       }
+               }
+       }
+}
+
+// some refactoring done, more should be
+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
+        * all while we're at it.
+        */
+       std::map<unsigned, unsigned> song_scores, player_scores;
+       conn.perform(FetchMaxScoreForSongs(tournament, &song_scores));
+       conn.perform(FetchMaxScoreForPlayers(tournament, round, &player_scores));
+       
+       Group group;
+       conn.perform(FetchGroup(tournament, round, parallel, &group));
+       gettimeofday(&last_updated, NULL);
+
+       memset(buf, 0, width * height * 4);
 
-                               y += 30;
+       std::vector<unsigned> colwidth;
+       
+       draw_main_heading(td);
+       find_column_widths(group, colwidth);
+       draw_column_headings(td, group, colwidth);
+       draw_scores(td, group, colwidth);
+       
+       unsigned num_scores = group.players[0].scores.size();
+
+       /*
+        * Approximate (but probably working quite well in practice) heuristic
+        * for finding the min and max rank of a player works as follows:
+        *
+        * First of all, find out, for each player in the group, what the
+        * maximum remaining score possibly can be (the minimum score is of
+        * course identical to the player's current total). For a random song,
+        * this is of course 1000 * (maximum feet rating) (but of course, that
+        * depends on whether we can play single or double! for now, assume
+        * double is okay, but this logic will be deferred to FetchMaxScore
+        * anyhow); for a random song, we simply pick the highest-ranking song
+        * we can find, EXCEPT those the player has chosen earlier AND the
+        * random songs this round, AND all random songs from elimination rounds
+        * (ie. rounds with only one group). (Phew!) This doesn't solve problems
+        * we'd face with more than one chosen song, but it should be good enough.
+        *
+        * After we've found the max and min scores for all players, it's a simple
+        * matter of sorting; the best attainable rank for player X is obtained if 
+        * X gets max score and all others get min score, the worst attainable rank
+        * is obtained if X gets min score and all others get max score.
+        */
+       std::vector<unsigned> max_score, min_score;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+               unsigned min_score_tp = 0, max_score_tp = 0;
+               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
+                       if (j->score != -1) {
+                               // already given
+                               min_score_tp += j->score;
+                               max_score_tp += j->score;
+                       } else {
+                               unsigned max_score_this_song;
+                               if (j->song.id != -1) {
+                                       // random song, or we know what song the player picked
+                                       max_score_this_song = song_scores[j->song.id];
+                               } else {
+                                       max_score_this_song = player_scores[i->id];
+                               }
+                               max_score_tp += max_score_this_song;
                        }
                }
+               max_score.push_back(max_score_tp);
+               min_score.push_back(min_score_tp);
+       }
+
+       // now finally find min and max rank, and draw it all
+       unsigned show_players = get_show_players(group);
+       unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
+       for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) {
+               unsigned best_rank = 1, worst_rank = 1;
+               for (unsigned j = 0; j < group.players.size(); ++j) {
+                       if (i == j)
+                               continue;
+
+                       if (max_score[i] < min_score[j])
+                               ++best_rank;
+                       if (min_score[i] <= max_score[j])
+                               ++worst_rank;
+               }
+
+               char text[16];
+               if (best_rank == worst_rank)
+                       std::sprintf(text, "%u", best_rank);
+               else
+                       std::sprintf(text, "%u-%u", best_rank, worst_rank);
+               
+               if (i % num_machines != machine)
+                       continue;
+               
+               // find out where to place this
+               unsigned x = 40 + colwidth[0];
+               for (unsigned j = 1; j <= num_scores + 1; ++j)
+                       x += colwidth[j] + 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);
+
+               if (show_players > 7)
+                       y += 40 - (show_players - 7) * 4;
+               else 
+                       y += 40;
        }
        
+       draw_next_up_single(buf, group, colwidth, song_scores, player_scores, max_score, min_score);
+       
        valid = true;
        draw_all_deferred_text(buf, td, last_text);
        last_text = td;
 }
 
+int GroupScreen::get_priority()
+{
+       return 10;
+}