1 files changed, 10 insertions, 29 deletions

diff --git a/src/app.rs b/src/app.rs
index 23458f4..99c0bb5 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -11,6 +11,7 @@ use crate::{
     lisp::{eval, lex::Lexer, parse::Parser, prelude, EnvList},
     message::Message,
     rect,
+    render::Signal,
     symmetry::Symmetry,
     undo::{ModifyRecord, OpKind, PaintRecord, UndoStack},
     utils::{self, draw_text, handle_error, is_copy_event, is_paste_event, load_script},
@@ -24,6 +25,7 @@ use std::{
     fs::File,
     io::prelude::*,
     path::{Path, PathBuf},
+    sync::mpsc::{Receiver, Sender},
 };
 
 use obi::{CompressionType, Image};
@@ -45,13 +47,11 @@ pub enum Mode {
     Command,
 }
 
-pub struct AppState<'ctx> {
+pub struct AppState {
     pub active_color: bool,
     pub brush: Brush,
-    pub canvas: Canvas<Window>,
     pub command_box: CommandBox,
     pub cache: RefCell<Option<Cache>>,
-    pub context: &'ctx Sdl,
     pub current_operation: Vec<PaintRecord>,
     pub dither_level: u8,
     pub file_name: Option<PathBuf>,
@@ -60,17 +60,17 @@ pub struct AppState<'ctx> {
     pub lisp_env: EnvList,
     pub message: Message,
     pub mode: Mode,
-    pub mouse: (i32, i32),
     pub pixmap: Pixmap<bool>,
     pub start: Point,
     pub symmetry: Symmetry,
-    pub ttf_context: &'ctx Sdl2TtfContext,
     pub undo_stack: UndoStack<ModifyRecord>,
     pub zoom: u8,
+    pub sender: Sender<Signal>,
+    pub receiver: Receiver<Signal>,
 }
 
 // private actions on appstate
-impl<'ctx> AppState<'ctx> {
+impl AppState {
     fn pan<P: Into<Point>>(&mut self, direction: P) {
         self.start += direction.into();
     }
@@ -602,34 +602,17 @@ impl<'ctx> AppState<'ctx> {
     pub fn init(
         width: u32,
         height: u32,
-        context: &'ctx Sdl,
-        ttf_context: &'ctx Sdl2TtfContext,
+        sender: Sender<Signal>,
+        receiver: Receiver<Signal>,
         start_data: Option<Vec<bool>>,
         file_name: Option<PathBuf>,
     ) -> Result<Self, AppError> {
-        let video_subsystem = context.video().map_err(AppError::Sdl)?;
-
-        let window = video_subsystem
-            .window("Pixel editor", 500, 500)
-            .position_centered()
-            .resizable()
-            .opengl()
-            .build()
-            .map_err(|e| AppError::Sdl(e.to_string()))?;
-
-        let canvas = window
-            .into_canvas()
-            .build()
-            .map_err(|e| AppError::Sdl(e.to_string()))?;
-
         let data = start_data.unwrap_or_else(|| vec![false; (width * height) as usize]);
         let pixmap = Pixmap::new_with(width, height, data);
         let mut app = Self {
             active_color: true,
             brush: Brush::new(0),
-            canvas,
             command_box: CommandBox::new(),
-            context,
             cache: RefCell::new(None),
             guides: HashMap::new(),
             current_operation: Vec::new(),
@@ -639,13 +622,13 @@ impl<'ctx> AppState<'ctx> {
             lisp_env: vec![prelude::new_env().map_err(AppError::Lisp)?],
             message: Message::new().text(" "),
             mode: Mode::Draw,
-            mouse: (0, 0),
             pixmap,
             start: Point::new(60, 60),
             symmetry: Default::default(),
-            ttf_context,
             undo_stack: UndoStack::new(),
             zoom: 5,
+            sender,
+            receiver,
         };
         load_script(STDLIB_PATH, &mut app).map_err(AppError::Lisp)?;
         std::fs::create_dir_all(RC_PATH).map_err(AppError::File)?;
@@ -676,8 +659,6 @@ impl<'ctx> AppState<'ctx> {
 
         let mut event_pump = self.context.event_pump().unwrap();
         'running: loop {
-            let mouse = event_pump.mouse_state();
-            self.mouse = (mouse.x(), mouse.y());
             for event in event_pump.poll_iter() {
                 if let Event::KeyDown {
                     keycode: Some(Keycode::Num9),