Merge pull request #68 from togglebyte/dev

Bugfix for canvas wrap-around

Author: togglebyte

anathema-backend/src/tui/screen.rs

@@ -3,7 +3,7 @@ use std::io::{Result, Write};
 use anathema_geometry::{Pos, Size};
 use anathema_widgets::paint::CellAttributes;
 use anathema_widgets::WidgetRenderer;
-use crossterm::event::{DisableMouseCapture, EnableMouseCapture};
+use crossterm::event::EnableMouseCapture;
 use crossterm::terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen};
 use crossterm::{cursor, ExecutableCommand, QueueableCommand};
 
@@ -131,7 +131,7 @@ impl Screen {
         disable_raw_mode()?;
         output.execute(LeaveAlternateScreen)?;
         #[cfg(not(target_os = "windows"))]
-        output.execute(DisableMouseCapture)?;
+        output.execute(crossterm::event::DisableMouseCapture)?;
         output.execute(cursor::Show)?;
         Ok(())
     }

anathema-default-widgets/src/canvas.rs

@@ -30,10 +30,10 @@ impl Buffer {
     fn put(&mut self, c: char, style: Style, pos: impl Into<LocalPos>) {
         let pos = pos.into();
 
-        let index = pos.to_index(self.size.width);
-        if index >= self.positions.len() {
-            return;
+        if pos.x as usize >= self.size.width || pos.y as usize >= self.size.height {
+            return
         }
+        let index = pos.to_index(self.size.width);
 
         let mut cell = Cell::Occupied(c, style);
         std::mem::swap(&mut self.positions[index], &mut cell);

anathema-templates/src/variables.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::rc::Rc;
 
+#[cfg(not(target_os = "windows"))]
 use anathema_debug::DebugWriter;
 use anathema_store::slab::Slab;
 
@@ -370,12 +371,14 @@ impl From<Variables> for HashMap<Rc<str>, Expression> {
     }
 }
 
+#[cfg(not(target_os = "windows"))]
 pub struct ScopeDebug<'a> {
     level: usize,
     scope: &'a Scope,
     store: &'a Slab<VarId, Expression>,
 }
 
+#[cfg(not(target_os = "windows"))]
 impl DebugWriter for ScopeDebug<'_> {
     fn write(&mut self, output: &mut impl std::fmt::Write) -> std::fmt::Result {
         let indent = " ".repeat(self.level * 4);
@@ -404,8 +407,10 @@ impl DebugWriter for ScopeDebug<'_> {
     }
 }
 
+#[cfg(not(target_os = "windows"))]
 pub struct VariablesDebug<'a>(pub(crate) &'a Variables);
 
+#[cfg(not(target_os = "windows"))]
 impl DebugWriter for VariablesDebug<'_> {
     fn write(&mut self, output: &mut impl std::fmt::Write) -> std::fmt::Result {
         ScopeDebug {