X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;fp=bigscreen%2Fgroupscreen.cpp;h=ee646840601c6119f08fa0b8738cdc83bc3f0ba1;hp=6639f4c057db0a83494ebe10e5c07963d9c1656e;hb=bbbf0f34d43aa3b6f43225fb6c2d45566a423ab1;hpb=d4ec885cadcbcce077579bdd24c93ead18b06852 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 6639f4c..ee64684 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -3,7 +3,6 @@ #include #include -#include "design.h" #include "resolution.h" #include "groupscreen.h" #include "fetch_group.h" @@ -12,6 +11,7 @@ #include "fetch_needs_update.h" #include "fetch_highscore.h" #include "fonts.h" +#include "theme.h" 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) @@ -60,8 +60,8 @@ void GroupScreen::draw_main_heading(std::vector &td) } } - unsigned width = my_draw_text(heading, NULL, 40.0); - my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60, MAIN_HEADING_RED, MAIN_HEADING_GREEN, MAIN_HEADING_BLUE); + unsigned width = my_draw_text(heading, NULL, 40.0, "mainheading"); + my_draw_text_deferred(td, heading, 40.0, "mainheading", "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60); } // make column headings from the first player's songs @@ -73,23 +73,25 @@ void GroupScreen::draw_column_headings(std::vector &td, const Group & unsigned x = 40 + colwidth[0]; for (std::vector::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 + colwidth[col] / 2 - this_width / 2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE); + unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading"); + my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100); } x += colwidth[col] + 20; } if (num_scores > 1) { - my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE); + unsigned this_width = my_draw_text("Total", NULL, 12.0, "columnheading"); + my_draw_text_deferred(td, "Total", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 1] / 2 - this_width / 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, COLUMN_HEADING_RED, COLUMN_HEADING_GREEN, COLUMN_HEADING_BLUE); + unsigned this_width = my_draw_text("Rank", NULL, 12.0, "columnheading"); + my_draw_text_deferred(td, "Rank", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 2] / 2 - this_width / 2, 100); } // show all the players and the scores void GroupScreen::draw_scores(std::vector &td, const Group &group, unsigned min_player, const std::vector &colwidth) { - unsigned max_num_width = my_draw_text("8888", NULL, 22.0); + unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "data"); 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); @@ -101,7 +103,7 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un if (m-1 < min_player) continue; - my_draw_text_deferred(td, i->nick, 18.0, 20, y, ROW_HEADING_RED, ROW_HEADING_GREEN, ROW_HEADING_BLUE); + my_draw_text_deferred(td, i->nick, 18.0, "rowheading", "rowheading", 20, y); x = 40 + colwidth[0]; @@ -112,18 +114,18 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un std::sprintf(text, "%u", j->score); } - unsigned this_width = my_draw_text(text, NULL, 22.0); + unsigned this_width = my_draw_text(text, NULL, 22.0, "data"); if (j->chosen) { - my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y); + my_draw_text_deferred(td, text, 22.0, "data", "freshdata", 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) > (colwidth[col] - 10 - max_num_width)) { - my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y); + if (my_draw_text(j->song.title, NULL, 12.0, "data") > (colwidth[col] - 10 - max_num_width)) { + my_draw_text_deferred(td, j->song.short_title, 12.0, "data", "freshdata", x + max_num_width + 10, y); } else { - my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y); + my_draw_text_deferred(td, j->song.title, 12.0, "data", "freshdata", x + max_num_width + 10, y); } } else { - my_draw_text_deferred(td, text, 22.0, x + colwidth[col] / 2 - this_width / 2, y); + my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[col] / 2 - this_width / 2, y); } x += colwidth[col] + 20; } @@ -133,8 +135,8 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un char text[16]; 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 + colwidth[num_scores + 1] / 2 - this_width / 2, y); + unsigned this_width = my_draw_text(text, NULL, 22.0, "data"); + my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[num_scores + 1] / 2 - this_width / 2, y); x += colwidth[num_scores + 1] + 20; } @@ -154,7 +156,7 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un void GroupScreen::find_column_widths(const Group &group, std::vector &colwidth) { unsigned num_scores; - unsigned max_num_width = my_draw_text("8888", NULL, 22.0); + unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "data"); unsigned sumcolwidth; for (unsigned mode = 0; mode < 2; ++mode) { @@ -164,17 +166,17 @@ void GroupScreen::find_column_widths(const Group &group, std::vector & if (colwidth.size() == 0) colwidth.push_back(0); - colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0)); + colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "data")); for (std::vector::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) + + colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0, "data") + 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], my_draw_text(j->song.short_title, NULL, 12.0, "data")); colwidth[col] = std::max(colwidth[col], max_num_width); } } @@ -188,9 +190,9 @@ void GroupScreen::find_column_widths(const Group &group, std::vector & } if (num_scores > 1) { - colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); + colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0, "columnheading"), max_num_width); } - colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0); + colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0, "columnheading"); // if we're at long titles and that works, don't try the short ones sumcolwidth = 0; @@ -407,12 +409,12 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, // OK, we have two players. Draw their nicks and the scores widestring text = widestring("Next players: ") + next_player->nick + widestring(" and ") + other_player->nick; - unsigned this_width = my_draw_text(text, NULL, 24.0); - my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "data"); + my_draw_text(text, buf, 24.0, "data", (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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(next_song->song.title, NULL, 20.0, "data"); + my_draw_text(next_song->song.title, buf, 20.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(next_song->song.id, &hs)); @@ -420,8 +422,8 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, 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); + this_width = my_draw_text(text, NULL, 16.0, "data"); + my_draw_text(text, buf, 16.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } } @@ -431,12 +433,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co const std::vector &max_score, const std::vector &min_score) { widestring text = widestring("Next player: ") + player.nick; - unsigned this_width = my_draw_text(text, NULL, 24.0); - my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "data"); + my_draw_text(text, buf, 24.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); if (song.song.id != -1) { - this_width = my_draw_text(song.song.title, NULL, 20.0); - my_draw_text(song.song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(song.song.title, NULL, 20.0, "data"); + my_draw_text(song.song.title, buf, 20.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(song.song.id, &hs)); @@ -444,8 +446,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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); + this_width = my_draw_text(text, NULL, 16.0, "data"); + my_draw_text(text, buf, 16.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } @@ -540,8 +542,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co if (lead_need > 1) { 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); + this_width = my_draw_text(text, NULL, 18.0, "data"); + my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -553,8 +555,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + this_width = my_draw_text(text, NULL, 18.0, "data"); + my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -573,8 +575,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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, "data"); + my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -602,13 +604,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) conn.perform(FetchGroup(tournament, round, parallel, &group)); gettimeofday(&last_updated, NULL); - unsigned char *ptr = buf; - for (unsigned i = 0; i < width * height; ++i) { - *ptr++ = BACKGROUND_BLUE; - *ptr++ = BACKGROUND_GREEN; - *ptr++ = BACKGROUND_RED; - *ptr++ = 0; - } + fill_background(buf, width, height); std::vector colwidth; @@ -720,8 +716,8 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) if (num_scores <= 1) x -= 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); + unsigned this_width = my_draw_text(text, NULL, 22.0, "data"); + my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[num_scores + 2] / 2 - this_width / 2, y); if (show_players > 7) y += 40 - (show_players - 7) * 4;