From e33eedba95fcff1e9c2118875d71bc538f3dd298 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 3 Nov 2019 10:10:58 +0000 Subject: simplify --- src/attrs.rs | 29 +++++++++++++++++++++-------- src/cell.rs | 4 ++-- src/color.rs | 12 ------------ src/lib.rs | 3 +-- src/screen.rs | 24 ++++++++++++------------ 5 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 src/color.rs diff --git a/src/attrs.rs b/src/attrs.rs index 87acb93..7e27f5a 100644 --- a/src/attrs.rs +++ b/src/attrs.rs @@ -1,3 +1,16 @@ +#[derive(Eq, PartialEq, Debug, Copy, Clone)] +pub enum Color { + Default, + Idx(u8), + Rgb(u8, u8, u8), +} + +impl Default for Color { + fn default() -> Self { + Self::Default + } +} + #[derive(enumset::EnumSetType, Debug)] pub enum TextMode { Bold, @@ -8,8 +21,8 @@ pub enum TextMode { #[derive(Default, Clone, Copy, PartialEq, Eq, Debug)] pub struct Attrs { - pub fgcolor: crate::color::Color, - pub bgcolor: crate::color::Color, + pub fgcolor: Color, + pub bgcolor: Color, pub mode: enumset::EnumSet, } @@ -67,10 +80,10 @@ impl Attrs { if self.fgcolor != other.fgcolor { match self.fgcolor { - crate::color::Color::Default => { + Color::Default => { opts.push(39); } - crate::color::Color::Idx(i) => { + Color::Idx(i) => { if i < 8 { opts.push(i + 30); } else if i < 16 { @@ -81,7 +94,7 @@ impl Attrs { opts.push(i); } } - crate::color::Color::Rgb(r, g, b) => { + Color::Rgb(r, g, b) => { opts.push(38); opts.push(2); opts.push(r); @@ -93,10 +106,10 @@ impl Attrs { if self.bgcolor != other.bgcolor { match self.bgcolor { - crate::color::Color::Default => { + Color::Default => { opts.push(49); } - crate::color::Color::Idx(i) => { + Color::Idx(i) => { if i < 8 { opts.push(i + 40); } else if i < 16 { @@ -107,7 +120,7 @@ impl Attrs { opts.push(i); } } - crate::color::Color::Rgb(r, g, b) => { + Color::Rgb(r, g, b) => { opts.push(48); opts.push(2); opts.push(r); diff --git a/src/cell.rs b/src/cell.rs index fbff5fb..9a29df1 100644 --- a/src/cell.rs +++ b/src/cell.rs @@ -46,11 +46,11 @@ impl Cell { &self.attrs } - pub fn fgcolor(&self) -> crate::color::Color { + pub fn fgcolor(&self) -> crate::attrs::Color { self.attrs.fgcolor } - pub fn bgcolor(&self) -> crate::color::Color { + pub fn bgcolor(&self) -> crate::attrs::Color { self.attrs.bgcolor } diff --git a/src/color.rs b/src/color.rs deleted file mode 100644 index b93acea..0000000 --- a/src/color.rs +++ /dev/null @@ -1,12 +0,0 @@ -#[derive(Eq, PartialEq, Debug, Copy, Clone)] -pub enum Color { - Default, - Idx(u8), - Rgb(u8, u8, u8), -} - -impl Default for Color { - fn default() -> Self { - Self::Default - } -} diff --git a/src/lib.rs b/src/lib.rs index b77b5e1..5e15deb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,12 +5,11 @@ mod attrs; mod cell; -mod color; mod grid; mod row; mod screen; mod unicode; pub use cell::Cell; -pub use color::Color; +pub use attrs::Color; pub use screen::Screen; diff --git a/src/screen.rs b/src/screen.rs index 19655fe..35a9d91 100644 --- a/src/screen.rs +++ b/src/screen.rs @@ -505,7 +505,7 @@ impl State { 24 => self.attrs.set_underline(false), 27 => self.attrs.set_inverse(false), n if n >= 30 && n <= 37 => { - self.attrs.fgcolor = crate::color::Color::Idx(n - 30); + self.attrs.fgcolor = crate::attrs::Color::Idx(n - 30); } 38 => match next_param!() { 2 => { @@ -513,19 +513,19 @@ impl State { let g = next_param!(); let b = next_param!(); self.attrs.fgcolor = - crate::color::Color::Rgb(r, g, b); + crate::attrs::Color::Rgb(r, g, b); } 5 => { self.attrs.fgcolor = - crate::color::Color::Idx(next_param!()); + crate::attrs::Color::Idx(next_param!()); } _ => {} }, 39 => { - self.attrs.fgcolor = crate::color::Color::Default; + self.attrs.fgcolor = crate::attrs::Color::Default; } n if n >= 40 && n <= 47 => { - self.attrs.bgcolor = crate::color::Color::Idx(n - 40); + self.attrs.bgcolor = crate::attrs::Color::Idx(n - 40); } 48 => match next_param!() { 2 => { @@ -533,22 +533,22 @@ impl State { let g = next_param!(); let b = next_param!(); self.attrs.bgcolor = - crate::color::Color::Rgb(r, g, b); + crate::attrs::Color::Rgb(r, g, b); } 5 => { self.attrs.bgcolor = - crate::color::Color::Idx(next_param!()); + crate::attrs::Color::Idx(next_param!()); } _ => {} }, 49 => { - self.attrs.bgcolor = crate::color::Color::Default; + self.attrs.bgcolor = crate::attrs::Color::Default; } n if n >= 90 && n <= 97 => { - self.attrs.fgcolor = crate::color::Color::Idx(n - 82); + self.attrs.fgcolor = crate::attrs::Color::Idx(n - 82); } n if n >= 100 && n <= 107 => { - self.attrs.bgcolor = crate::color::Color::Idx(n - 92); + self.attrs.bgcolor = crate::attrs::Color::Idx(n - 92); } _ => {} } @@ -804,11 +804,11 @@ impl Screen { (self.state.grid().pos().row, self.state.grid().pos().col) } - pub fn fgcolor(&self) -> crate::color::Color { + pub fn fgcolor(&self) -> crate::attrs::Color { self.state.attrs.fgcolor } - pub fn bgcolor(&self) -> crate::color::Color { + pub fn bgcolor(&self) -> crate::attrs::Color { self.state.attrs.bgcolor } -- cgit v1.2.3-54-g00ecf