1 files changed, 24 insertions, 8 deletions

diff --git a/src/main.rs b/src/main.rs
index 225c37c..04b0f2b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,6 +18,7 @@ mod grid;
 mod guide;
 mod lisp;
 mod message;
+mod render;
 mod symmetry;
 mod undo;
 mod utils;
@@ -27,12 +28,19 @@ use {
     app::AppState,
     cli::Config,
     error::{AppError, SdlTTFError},
+    render::Signal,
 };
 
+use std::{sync::mpsc, thread};
+
 use log::{error, info};
+use sdl2::event::Event;
 
 pub fn error_sink() -> Result<(), AppError> {
-    let init = || {
+    let (render_tx, app_rx) = mpsc::channel();
+    let (app_tx, render_rx) = mpsc::channel();
+
+    let render_handle = thread::spawn(move || -> Result<(), AppError> {
         let sdl_context = sdl2::init().map_err(AppError::Sdl)?;
         info!("Initialized SDL context");
 
@@ -40,8 +48,18 @@ pub fn error_sink() -> Result<(), AppError> {
             .map_err(SdlTTFError::Init)
             .map_err(AppError::SdlTTF)?;
         info!("Initialized SDL_ttf context");
-        Ok((sdl_context, ttf_context))
-    };
+        while let Ok(signal) = render_rx.recv() {
+            match signal {
+                Signal::Quit => {
+                    let ev = sdl_context.event().unwrap();
+                    ev.push_event(Event::Quit { timestamp: 0u32 })
+                        .expect("unable to quit ohno");
+                }
+                _ => {}
+            }
+        }
+        Ok(())
+    });
 
     match cli::parse_args().map_err(AppError::Cli)? {
         Config::Help => {
@@ -52,18 +70,16 @@ pub fn error_sink() -> Result<(), AppError> {
             file_name,
             dimensions: (width, height),
         } => {
-            let (sdl_context, ttf_context) = init()?;
-            AppState::init(width, height, &sdl_context, &ttf_context, None, file_name)?.run();
+            AppState::init(width, height, app_tx, app_rx, None, file_name)?.run();
         }
 
         Config::ExistingProject { file_name } => {
-            let (sdl_context, ttf_context) = init()?;
             let image = utils::load_file(&file_name).map_err(AppError::File)?;
             AppState::init(
                 image.width(),
                 image.height(),
-                &sdl_context,
-                &ttf_context,
+                app_tx,
+                app_rx,
                 Some(image.data),
                 Some(file_name),
             )?