X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=ce65d043a349e7d74b3c8e8a3f0688fa6b2cd14e;hb=ba36fcef2279cda6e700e47edf16254e1f4e0e6a;hp=2694e3711850820c72904153a5ef762e298a3252;hpb=fe5d8dd4bcbab4fed744782495a9fecdb5a5b1a7;p=ccbs

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 2694e37..ce65d04 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -26,6 +26,7 @@ std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
 GenericScreen *mainscreen = NULL;
 unsigned char framebuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4], screenbuf[SCREEN_WIDTH * SCREEN_HEIGHT * 4];
+bool quit_requested = false;
 
 void init(pqxx::connection &conn)
 {
@@ -39,8 +40,6 @@ 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;
@@ -69,6 +68,8 @@ void init(pqxx::connection &conn)
 		}
 	}
 
+	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,
@@ -144,7 +145,7 @@ void main_loop(pqxx::connection &conn)
 	}
 
 	if (mainscreen && mainscreen->check_invalidated()) {
-		if (screen->pitch == SCREEN_WIDTH) {
+		if (screen->pitch == SCREEN_WIDTH * 4) {
 			SDL_LockSurface(screen);
 			mainscreen->draw((unsigned char *)screen->pixels, SCREEN_WIDTH, SCREEN_HEIGHT);
 			SDL_UnlockSurface(screen);
@@ -166,6 +167,19 @@ void main_loop(pqxx::connection &conn)
 	}
 }
 
+void handle_events()
+{
+	SDL_Event event;
+	while (SDL_PollEvent(&event)) {
+		if (event.type == SDL_QUIT) {
+			quit_requested = true;
+		}
+		if (event.type == SDL_KEYUP && event.key.keysym.sym == SDLK_ESCAPE) {
+			quit_requested = true;
+		}
+	}
+}
+
 int main(int argc, char **argv)
 {
 	SDL_Init(SDL_INIT_VIDEO);
@@ -188,15 +202,21 @@ int main(int argc, char **argv)
 		
 		// when active_tournament or active_rounds is changed, we destroy everything and start from scratch
 		// (at least currently)
-		for ( ;; ) {
+		while (!quit_requested) {
 			tournament_changed.reset_flag();
 			rounds_changed.reset_flag();
 			init(conn);
 			do {
 				main_loop(conn);
 				conn.get_notifs();
-			} while (!tournament_changed.get_flag() && !rounds_changed.get_flag());
-			std::fprintf(stderr, "active_tournament or active_groups changed, resetting...\n");
+				handle_events();
+			} while (!tournament_changed.get_flag() && !rounds_changed.get_flag() && !quit_requested);
+
+			if (quit_requested) {
+				fprintf(stderr, "Quitting...\n");
+			} else {
+				fprintf(stderr, "active_tournament or active_groups changed, resetting...\n");
+			}
 		}
 	} catch (const std::exception &e) {
 		std::fprintf(stderr, "Exception: %s\n", e.what());