Reinstate the splitscreen.

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index d09b1c4d36f1fae35d363aa0fe7bd01ae1ef34aa..e9a30110c5eb449ed67ca0a067f2d6dac4e4eb68 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -39,9 +39,13 @@ void init(pqxx::connection &conn)
        }
        screens.erase(screens.begin(), screens.end());
 
+       bool show_only_main_screen = (USE_SPLITSCREEN && screens.size() == 1);
+
+#if !USE_SPLITSCREEN
        RotateScreen *rs = new RotateScreen();
        mainscreen = rs;
-       
+#endif
+
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 
@@ -56,12 +60,28 @@ 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));
                        }
                }
        }
 
-       {
+       /*
+        * 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)

diff --git a/bigscreen/resolution.h b/bigscreen/resolution.h
index e58e1175504acfe6504fa5758d776d0211127861..f56ddf437b237b4f2b78039268c30bd4cba4084a 100644 (file)
--- a/bigscreen/resolution.h
+++ b/bigscreen/resolution.h
@@ -1,11 +1,12 @@
 #ifndef _RESOLUTION_H
 #define _RESOLUTION_H 1
 
-#define SCREEN_WIDTH 640
-#define SCREEN_HEIGHT 480
-#define SCREEN_LCD 0
+#define SCREEN_WIDTH 1024
+#define SCREEN_HEIGHT 768
+#define SCREEN_LCD 1
 
 #define USE_FULLSCREEN 1
+#define USE_SPLITSCREEN 1
 
 /*
  * This is used in the screens, mostly for historical reasons (they were