X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=88fce1cc03606f527cce3c12158cd641c2956466;hb=6bd21f38c6a860ba75ea98f2404c83d9bd55498a;hp=c13c3325ffb821e39335c4527bbeb83ecbc206b8;hpb=16d44dda496bb6fec27aeea13decaae16fd08f7e;p=ccbs

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index c13c332..88fce1c 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,6 +1,7 @@
 #include <cstdio>
 #include <algorithm>
 #include <map>
+#include <assert.h>
 
 #include "resolution.h"
 #include "groupscreen.h"
@@ -26,13 +27,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;
 }
 
@@ -86,7 +86,7 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 }	
 	
 // show all the players and the scores
-void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth)
+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 num_scores = group.players[0].scores.size();
@@ -97,6 +97,8 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, co
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) {
 		if (m++ % num_machines != machine)
 			continue;
+		if (m-1 < min_player)
+			continue;
 
 		my_draw_text_deferred(td, i->nick, 18.0, 20, y);
 
@@ -195,7 +197,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) {
@@ -207,7 +209,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;
 
@@ -219,7 +221,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;
 		}
 	}
 }
@@ -606,7 +608,30 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 	draw_main_heading(td);
 	find_column_widths(group, colwidth);
 	draw_column_headings(td, group, colwidth);
-	draw_scores(td, group, colwidth);
+
+	// Find out which player is next. we want to show SHOW_PLAYERS players, centered
+	// around this as much as possible. (Usually, this will mean all, but not always.)
+	unsigned show_players = get_show_players(group);
+	const Player *center_player = get_next_player(group);
+	
+	// find the index (kind of backwards...)
+	int player_index = -1;
+	for (unsigned i = 0; i < group.players.size(); ++i) {
+		if (&(group.players[i]) == center_player) {
+			player_index = i;
+			break;
+		}
+	}
+
+	assert(player_index >= 0);
+
+	int min_player = player_index - signed(show_players) / 2;
+	if (min_player + show_players > group.players.size()) // FIXME: songs_per_machine
+		min_player = group.players.size() - show_players;
+	if (min_player < 0)
+		min_player = 0;
+
+	draw_scores(td, group, min_player, colwidth);
 	
 	unsigned num_scores = group.players[0].scores.size();
 
@@ -653,11 +678,10 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		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) {
+	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) {
 			if (i == j)
@@ -677,6 +701,8 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 		
 		if (i % num_machines != machine)
 			continue;
+		if (signed(i) < min_player)
+			continue;
 		
 		// find out where to place this
 		unsigned x = 40 + colwidth[0];