@@ -10,11 +10,13 @@ use helix_view::{
1010 align_view,
1111 document::DocumentSavedEventResult,
1212 editor::{ConfigEvent, EditorEvent},
13+ graphics::Rect,
1314 theme,
1415 tree::Layout,
1516 Align, Editor,
1617};
1718use serde_json::json;
19+use tui::backend::Backend;
1820
1921use crate::{
2022 args::Args,
@@ -53,8 +55,18 @@ type Signals = futures_util::stream::Empty<()>;
5355
5456const LSP_DEADLINE: Duration = Duration::from_millis(16);
5557
58+#[cfg(not(feature = "integration"))]
59+use tui::backend::CrosstermBackend;
60+
61+#[cfg(not(feature = "integration"))]
62+type Terminal = tui::terminal::Terminal<CrosstermBackend<std::io::Stdout>>;
63+
64+#[cfg(feature = "integration")]
65+type Terminal = tui::terminal::Terminal<TestBackend>;
66+
5667pub struct Application {
5768 compositor: Compositor,
69+ terminal: Terminal,
5870 pub editor: Editor,
5971
6072 config: Arc<ArcSwap<Config>>,
@@ -143,10 +155,18 @@ impl Application {
143155
144156 let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
145157
146− let mut compositor = Compositor::new().context("build compositor")?;
158+ #[cfg(not(feature = "integration"))]
159+ let backend = CrosstermBackend::new(stdout());
160+
161+ #[cfg(feature = "integration")]
162+ let backend = TestBackend::new(120, 150);
163+
164+ let terminal = Terminal::new(backend)?;
165+ let area = terminal.size().expect("couldn't get terminal size");
166+ let mut compositor = Compositor::new(area);
147167 let config = Arc::new(ArcSwap::from_pointee(config));
148168 let mut editor = Editor::new(
149− compositor.size(),
169+ area,
150170 theme_loader.clone(),
151171 syn_loader.clone(),
152172 Box::new(Map::new(Arc::clone(&config), |config: &Config| {
@@ -233,6 +253,7 @@ impl Application {
233253
234254 let app = Self {
235255 compositor,
256+ terminal,
236257 editor,
237258
238259 config,
@@ -254,15 +275,26 @@ impl Application {
254275
255276 #[cfg(not(feature = "integration"))]
256277 fn render(&mut self) {
257− let compositor = &mut self.compositor;
258−
259278 let mut cx = crate::compositor::Context {
260279 editor: &mut self.editor,
261280 jobs: &mut self.jobs,
262281 scroll: None,
263282 };
264283
265− compositor.render(&mut cx);
284+ let area = self
285+ .terminal
286+ .autoresize()
287+ .expect("Unable to determine terminal size");
288+
289+ // TODO: need to recalculate view tree if necessary
290+
291+ let surface = self.terminal.current_buffer_mut();
292+
293+ self.compositor.render(area, surface, &mut cx);
294+
295+ let (pos, kind) = self.compositor.cursor(area, &self.editor);
296+ let pos = pos.map(|pos| (pos.col as u16, pos.row as u16));
297+ self.terminal.draw(pos, kind).unwrap();
266298 }
267299
268300 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
@@ -392,17 +424,24 @@ impl Application {
392424
393425 #[cfg(not(windows))]
394426 pub async fn handle_signals(&mut self, signal: i32) {
395− use helix_view::graphics::Rect;
396427 match signal {
397428 signal::SIGTSTP => {
429+ // restore cursor
430+ use helix_view::graphics::CursorKind;
431+ self.terminal
432+ .backend_mut()
433+ .show_cursor(CursorKind::Block)
434+ .ok();
398435 restore_term().unwrap();
399436 low_level::emulate_default_handler(signal::SIGTSTP).unwrap();
400437 }
401438 signal::SIGCONT => {
402439 self.claim_term().await.unwrap();
403440 // redraw the terminal
404− let Rect { width, height, .. } = self.compositor.size();
405− self.compositor.resize(width, height);
441+ let area = self.terminal.size().expect("couldn't get terminal size");
442+ self.compositor.resize(area);
443+ self.terminal.clear().expect("couldn't clear terminal");
444+
406445 self.render();
407446 }
408447 signal::SIGUSR1 => {
@@ -539,7 +578,14 @@ impl Application {
539578 // Handle key events
540579 let should_redraw = match event.unwrap() {
541580 CrosstermEvent::Resize(width, height) => {
542− self.compositor.resize(width, height);
581+ self.terminal
582+ .resize(Rect::new(0, 0, width, height))
583+ .expect("Unable to resize terminal");
584+
585+ let area = self.terminal.size().expect("couldn't get terminal size");
586+
587+ self.compositor.resize(area);
588+
543589 self.compositor
544590 .handle_event(&Event::Resize(width, height), &mut cx)
545591 }
@@ -923,10 +969,9 @@ impl Application {
923969
924970 async fn claim_term(&mut self) -> Result<(), Error> {
925971 use helix_view::graphics::CursorKind;
926− use tui::backend::Backend;
927972 terminal::enable_raw_mode()?;
928− if self.compositor.terminal.cursor_kind() == CursorKind::Hidden {
929− self.compositor.terminal.backend_mut().hide_cursor().ok();
973+ if self.terminal.cursor_kind() == CursorKind::Hidden {
974+ self.terminal.backend_mut().hide_cursor().ok();
930975 }
931976 let mut stdout = stdout();
932977 execute!(
@@ -962,14 +1007,12 @@ impl Application {
9621007
9631008 let close_errs = self.close().await;
9641009
1010+ // restore cursor
9651011 use helix_view::graphics::CursorKind;
966− use tui::backend::Backend;
967− self.compositor
968− .terminal
1012+ self.terminal
9691013 .backend_mut()
9701014 .show_cursor(CursorKind::Block)
9711015 .ok();
972−
9731016 restore_term()?;
9741017
9751018 for err in close_errs {