Fix all the things

src/module.rs

@@ -6,45 +6,59 @@ use std::sync::{Arc, Mutex};
 use chrono::{DateTime, Local};
 
 pub enum Input {
-	Click{pos: (u32, u32), button: u32},
-	Scroll{pos: (u32, u32), x: f64, y: f64},
+    Click { pos: (u32, u32), button: u32 },
+    Scroll { pos: (u32, u32), x: f64, y: f64 },
 }
 
 pub trait ModuleImpl {
-	fn draw(&self, buf: &mut Buffer, bg: &Color, time: &DateTime<Local>) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error>;
-	fn update(&mut self, time: &DateTime<Local>, force: bool) -> Result<bool, ::std::io::Error>;
-	fn input(&mut self, input: Input);
+    fn draw(
+        &self,
+        buf: &mut Buffer,
+        bg: &Color,
+        time: &DateTime<Local>,
+    ) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error>;
+    fn update(&mut self, time: &DateTime<Local>, force: bool) -> Result<bool, ::std::io::Error>;
+    fn input(&mut self, input: Input);
 }
 
 pub struct Module {
-	m: Arc<Mutex<Box<dyn ModuleImpl>>>,
-	pos: (u32, u32, u32, u32),
+    m: Arc<Mutex<Box<dyn ModuleImpl>>>,
+    pos: (u32, u32, u32, u32),
 }
 
 impl Module {
-	pub fn new(m: Box<dyn ModuleImpl>, pos: (u32, u32, u32, u32)) -> Module {
-		Module{
-			m: Arc::new(Mutex::new(m)),
-			pos: pos,
-		}
-	}
+    pub fn new(m: Box<dyn ModuleImpl>, pos: (u32, u32, u32, u32)) -> Module {
+        Module {
+            m: Arc::new(Mutex::new(m)),
+            pos: pos,
+        }
+    }
 
-	pub fn update(&self, time: &DateTime<Local>, force: bool) -> Result<bool, ::std::io::Error> {
-		self.m.lock().unwrap().update(time, force)
-	}
+    pub fn get_bounds(&self) -> (u32, u32, u32, u32) {
+        self.pos
+    }
 
-	pub fn draw(&self, buf: &mut Buffer, bg: &Color, time: &DateTime<Local>) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error> {
-		self.m.lock().unwrap().draw(&mut buf.subdimensions(self.pos), bg, time)
-	}
+    pub fn update(&self, time: &DateTime<Local>, force: bool) -> Result<bool, ::std::io::Error> {
+        self.m.lock().unwrap().update(time, force)
+    }
 
-	pub fn intersect(&self, pos: (u32, u32)) -> bool {
-		pos.0 >= self.pos.0 &&
-		   pos.0 < (self.pos.0 + self.pos.2) &&
-		   pos.1 >= self.pos.1 &&
-		   pos.1 < (self.pos.1 + self.pos.3)
-	}
+    pub fn draw(
+        &self,
+        buf: &mut Buffer,
+        bg: &Color,
+        time: &DateTime<Local>,
+    ) -> Result<Vec<(i32, i32, i32, i32)>, ::std::io::Error> {
+        self.m.lock().unwrap().draw(buf, bg, time)
+    }
 
-	pub fn input(&self, input: Input) {
-		self.m.lock().unwrap().input(input)
-	}
-}
+    pub fn intersect(&self, pos: (u32, u32)) -> bool {
+        pos.0 >= self.pos.0
+            && pos.0 < (self.pos.0 + self.pos.2)
+            && pos.1 >= self.pos.1
+            && pos.1 < (self.pos.1 + self.pos.3)
+    }
+
+    pub fn input(&self, input: Input) {
+        self.m.lock().unwrap().input(input)
+    }
+}