X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Ftop10scorescreen.cpp;h=5ff01a88f54db6f9689c52d928aa690d483b0dfb;hb=d4ec885cadcbcce077579bdd24c93ead18b06852;hp=6ae58fd1d9d5c7b970253e9dc20be79a29434678;hpb=0b3bb271ac40b5f8bcfc5a417d4423e92c4483b1;p=ccbs

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 6ae58fd..5ff01a8 100644
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -1,9 +1,16 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #include "top10scorescreen.h"
 #include "fonts.h"
 
+#define RANK_X 30
+#define PLAYER_X 70
+#define SONG_X 370
+#define SCORE_X (LOGICAL_SCREEN_WIDTH - 72)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 480)
+
 Top10ScoreScreen::Top10ScoreScreen(pqxx::connection &conn, unsigned tournament)
 	: conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
 {
@@ -19,6 +26,7 @@ bool Top10ScoreScreen::check_invalidated()
 		return true;
 	if (!scores_changed.get_flag())
 		return false;
+	scores_changed.reset_flag();
 
 	// check that there are indeed changes, otherwise don't bother
 	std::vector<TopScore> scores;
@@ -26,17 +34,25 @@ bool Top10ScoreScreen::check_invalidated()
 	
 	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		if (seen_topscore.count(*i) == 0) {
+			valid = false;
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
-void Top10ScoreScreen::draw(unsigned char *buf)
+void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
 	scores_changed.reset_flag();
-	memset(buf, 0, 800 * 600 * 4);
+	unsigned char *ptr = buf;
+	for (unsigned i = 0; i < width * height; ++i) {
+		*ptr++ = BACKGROUND_BLUE;
+		*ptr++ = BACKGROUND_GREEN;
+		*ptr++ = BACKGROUND_RED;
+		*ptr++ = 0;
+	}
+	set_screen_size(width, height);
 
 	// fetch the top 10 scores
 	std::vector<TopScore> scores;
@@ -44,39 +60,43 @@ void Top10ScoreScreen::draw(unsigned char *buf)
 
 	{
 		unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
-		my_draw_text("Today's top 10 scores", buf, 40.0, 800/2 - width/2, 60);
+		my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60, MAIN_HEADING_RED, MAIN_HEADING_GREEN, MAIN_HEADING_BLUE);
 	}
 
 	// simple headings
-	my_draw_text("Player", buf, 12.0, 70, 100);
-	my_draw_text("Song", buf, 12.0, 250, 100);
-	my_draw_text("Score", buf, 12.0, 710, 100);
+	my_draw_text("Player", buf, 12.0, PLAYER_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
+	my_draw_text("Song", buf, 12.0, SONG_X, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
+	width = my_draw_text("Score", NULL, 12.0);
+	my_draw_text("Score", buf, 12.0, SCORE_X - width/2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE);
 	
 	unsigned row = 1, y = 140;
 	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
 		char str[16];
-		unsigned r = 255, g = 255, b = 255;
+		unsigned r = DATA_RED, g = DATA_GREEN, b = DATA_BLUE, rh = ROW_HEADING_RED, gh = ROW_HEADING_GREEN, bh = ROW_HEADING_BLUE;
 
 		// print new entries in red
 		if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
-			g = b = 0;
+			r = rh = FRESH_DATA_RED;
+			g = gh = FRESH_DATA_GREEN;
+			b = bh = FRESH_DATA_BLUE;
 		}
 
 		std::sprintf(str, "%u", row++);
 		unsigned width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 30 - width/2, y);
+		my_draw_text(str, buf, 24.0, RANK_X - width/2, y, rh, gh, bh);
 
-		my_draw_text(i->nick, buf, 24.0, 70, y, r, g, b);
+		my_draw_text(i->nick, buf, 24.0, PLAYER_X, y, r, g, b);
 
-		if (my_draw_text(i->title, NULL, 24.0) > 430) {
-			my_draw_text(i->shorttitle, buf, 24.0, 250, y, r, g, b);
+		if (my_draw_text(i->title, NULL, 24.0) > SONG_MAX_WIDTH &&
+		    !i->shorttitle.empty()) {
+			my_draw_text(i->shorttitle, buf, 24.0, SONG_X, y, r, g, b);
 		} else {
-			my_draw_text(i->title, buf, 24.0, 250, y, r, g, b);
+			my_draw_text(i->title, buf, 24.0, SONG_X, y, r, g, b);
 		}
 		
 		std::sprintf(str, "%u", i->score);
 		width = my_draw_text(str, NULL, 24.0);
-		my_draw_text(str, buf, 24.0, 728 - width/2, y, r, g, b);
+		my_draw_text(str, buf, 24.0, SCORE_X - width/2, y, r, g, b);
 
 		y += 40;
 	}