Merge branch 'uefi' of ssh://git.ablecorp.us:20/able/ableos into uefi

ableos/src/experiments/vterm.rs

@@ -1,3 +1,5 @@
+use core::ops::Not;
+
 use shadeable::pixel_format::Rgba64;
 
 pub const VTERM_HEIGHT: u32 = 40;
@@ -10,9 +12,9 @@ pub type ColorCharacter = (Rgba64, Rgba64);
 pub struct VtermCharacter {
    pub character: char,
    //
-    pub char_color: ColorCharacter,
-    //
    pub style: Style,
+   //
+   pub char_color: ColorCharacter,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -25,8 +27,84 @@ pub struct Style {
    pub strike: bool,
 }
 
+#[derive(Default)]
 pub struct StylePacked(pub u8);
 
+impl StylePacked {
+   pub fn bold(&self) -> bool {
+      (self.0 & 0x01) > 0
+   }
+   pub fn underlined(&self) -> bool {
+      (self.0 & 0x02) > 0
+   }
+   pub fn italic(&self) -> bool {
+      (self.0 & 0x04) > 0
+   }
+   pub fn blinking(&self) -> bool {
+      (self.0 & 0x08) > 0
+   }
+   pub fn reversed(&self) -> bool {
+      (self.0 & 0x10) > 0
+   }
+   pub fn struck(&self) -> bool {
+      (self.0 & 0x20) > 0
+   }
+   #[must_use]
+   pub fn set_bold(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x01;
+      } else {
+         self.0 &= 0x01u8.not();
+      }
+      self
+   }
+   #[must_use]
+   pub fn set_underlined(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x02;
+      } else {
+         self.0 &= 0x02u8.not();
+      }
+      self
+   }
+   #[must_use]
+   pub fn set_italic(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x04;
+      } else {
+         self.0 &= 0x04u8.not();
+      }
+      self
+   }
+   #[must_use]
+   pub fn set_blinking(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x08;
+      } else {
+         self.0 &= 0x08u8.not();
+      }
+      self
+   }
+   #[must_use]
+   pub fn set_reversed(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x10;
+      } else {
+         self.0 &= 0x10u8.not();
+      }
+      self
+   }
+   #[must_use]
+   pub fn set_struck(mut self, v: bool) -> Self {
+      if v {
+         self.0 |= 0x20;
+      } else {
+         self.0 &= 0x20u8.not();
+      }
+      self
+   }
+}
+
 pub struct Vterm {
    pub characters: [[VtermCharacter; VTERM_WIDTH as usize]; VTERM_HEIGHT as usize],
    /// The internal representation of the vterm
@@ -37,8 +115,8 @@ pub struct Vterm {
    pub cursor_visible: bool,
 }
 
-impl Vterm {
-    pub fn new() -> Self {
+impl Default for Vterm {
+   fn default() -> Self {
       Vterm {
          characters: [[VtermCharacter {
             character: ' ',
@@ -64,7 +142,9 @@ impl Vterm {
          },
       }
    }
+}
 
+impl Vterm {
    /// Set the vterm cursor to the given position
    pub fn set_cursor_position(&mut self, x: u32, y: u32) {
       if x > VTERM_WIDTH {