X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=7165bc393006f1843c406bb28943ec04bdfa8652;hb=405a983fa5d81d4ea5efdf13fa43dbe14a6d8a87;hp=fa2fefdc6585c6c0fa4121cfee68c0aee714d590;hpb=342ff9578b148017e71771a282ee7c988e4a99e6;p=ccbs

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index fa2fefd..7165bc3 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -39,9 +39,11 @@ void init(pqxx::connection &conn)
 	}
 	screens.erase(screens.begin(), screens.end());
 
+#if !USE_SPLITSCREEN
 	RotateScreen *rs = new RotateScreen();
 	mainscreen = rs;
-	
+#endif
+
 	conn.perform(FetchCurrentTournament(&active_tournament));
 	conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -56,12 +58,30 @@ void init(pqxx::connection &conn)
 
 			// memory leaks here?
 			for (unsigned j = 0; j < i->num_machines; ++j) {
+#if USE_SPLITSCREEN
+				RotateScreen *rs = new RotateScreen();
+				screens.push_back(rs);
+#endif
 				rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines, i->players_per_machine));
 			}
 		}
 	}
 
-	{
+	bool show_only_main_screen = (USE_SPLITSCREEN && screens.size() == 1);
+
+	/*
+	 * Show auxilliary screens except if we have too many already,
+	 * or if we're in the special split-screen end-tournament mode,
+	 * where there if only one.
+	 */
+	RotateScreen *aux_screen = NULL;
+	if (screens.size() < 4 && !show_only_main_screen) {
+#if USE_SPLITSCREEN
+		RotateScreen *rs = new RotateScreen();
+		screens.push_back(rs);
+#endif
+		aux_screen = rs;
+
 		conn.perform(FetchAuxilliaryScreens(&aux_screens));
 		for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
 			if (*i == widestring("top10scores")) {
@@ -74,6 +94,45 @@ void init(pqxx::connection &conn)
 			}
 		}
 	}
+
+#if USE_SPLITSCREEN
+	/*
+	 * If we still have room, make yet another rotational screen with
+	 * results from previous groups -- otherwise tack them onto the end
+	 * of the auxilliary screens.
+	 */
+	RotateScreen *finished_groups_screen;
+	if (show_only_main_screen) {
+		finished_groups_screen = NULL;
+	} else if (screens.size() < 4) {
+		finished_groups_screen = new RotateScreen();
+		screens.push_back(finished_groups_screen);
+	} else {
+		finished_groups_screen = aux_screen;
+	}
+	if (finished_groups_screen != NULL) {
+		std::vector<SkeletonGroup> finished_groups;
+		conn.perform(FetchListOfFinishedGroups(active_tournament.id, &finished_groups));
+
+		for (std::vector<SkeletonGroup>::const_iterator i = finished_groups.begin(); i != finished_groups.end(); ++i) {
+			finished_groups_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1, 1));
+		}
+	}
+#endif
+
+#if USE_SPLITSCREEN
+	// hack
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+	screens.push_back(NULL);
+
+	if (screens[1] == NULL) {
+		mainscreen = screens[0];
+	} else {
+		mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+	}
+#endif
 }
 
 void main_loop(pqxx::connection &conn)
@@ -85,14 +144,20 @@ void main_loop(pqxx::connection &conn)
 	}
 
 	if (mainscreen && mainscreen->check_invalidated()) {
-		mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
-		SDL_LockSurface(screen);
-		for (unsigned y = 0; y < SCREEN_HEIGHT; ++y) {
-			unsigned char *sptr = framebuf + y * SCREEN_WIDTH * 4;
-			unsigned char *dptr = (unsigned char *)screen->pixels + y * screen->pitch;
-			memcpy(dptr, sptr, SCREEN_WIDTH * 4);
+		if (screen->pitch == SCREEN_WIDTH * 4) {
+			SDL_LockSurface(screen);
+			mainscreen->draw((unsigned char *)screen->pixels, SCREEN_WIDTH, SCREEN_HEIGHT);
+			SDL_UnlockSurface(screen);
+		} else {
+			mainscreen->draw(framebuf, SCREEN_WIDTH, SCREEN_HEIGHT);
+			SDL_LockSurface(screen);
+			for (unsigned y = 0; y < SCREEN_HEIGHT; ++y) {
+				unsigned char *sptr = framebuf + y * SCREEN_WIDTH * 4;
+				unsigned char *dptr = (unsigned char *)screen->pixels + y * screen->pitch;
+				memcpy(dptr, sptr, SCREEN_WIDTH * 4);
+			}
+			SDL_UnlockSurface(screen);
 		}
-		SDL_UnlockSurface(screen);
 		SDL_Flip(screen);
 		conn.await_notification(0, 10000);
 	} else {
@@ -106,6 +171,7 @@ int main(int argc, char **argv)
 	SDL_Init(SDL_INIT_VIDEO);
 #if USE_FULLSCREEN
 	screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_DOUBLEBUF | SDL_FULLSCREEN);
+	SDL_ShowCursor(SDL_DISABLE);
 #else
 	screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_DOUBLEBUF);
 #endif