X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=ce65d043a349e7d74b3c8e8a3f0688fa6b2cd14e;hb=d4ec885cadcbcce077579bdd24c93ead18b06852;hp=7165bc393006f1843c406bb28943ec04bdfa8652;hpb=903bc4753510549ae5a2541acce7064c5f09835f;p=ccbs

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 7165bc3..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)
 {
@@ -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());