From fac5bf1f50a9f10b2f35842314ae777921ff2a53 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sun, 20 Jan 2019 02:23:54 +0200
Subject: [PATCH] Add Color helpers

---
 src/main.rs             | 11 +++++------
 src/platform/display.rs | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index db51ee8..4a9f1e9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,13 +49,12 @@ fn kmain() -> ! {
     // writeln!(uart, "Hey there, mini uart talking!");
 
     if let Some(mut display) = VC::init_fb(Size2d { x: 800, y: 600 } /*, &mut uart*/) {
-        display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64).0);
-        display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255).0);
-        // display.draw_text(50, 150, core::fmt("Display width {}", display.width), Color::rgb(255,0,0).0);
+        display.rect(10, 10, 250, 250, Color::rgb(32, 96, 64));
+        display.draw_text(50, 50, "Hello there!", Color::rgb(128, 192, 255));
 
-        display.draw_text(150, 50, "RED", Color::rgb(255, 0, 0).0);
-        display.draw_text(160, 60, "GREEN", Color::rgb(0, 255, 0).0);
-        display.draw_text(170, 70, "BLUE", Color::rgb(0, 0, 255).0);
+        display.draw_text(150, 50, "RED", Color::red());
+        display.draw_text(160, 60, "GREEN", Color::green());
+        display.draw_text(170, 70, "BLUE", Color::blue());
     }
 
     // writeln!(uart, "Bye, going to sleep now");
diff --git a/src/platform/display.rs b/src/platform/display.rs
index d9e6b7e..10a0180 100644
--- a/src/platform/display.rs
+++ b/src/platform/display.rs
@@ -13,6 +13,22 @@ impl Color {
     pub fn rgb(r: u8, g: u8, b: u8) -> Color {
         Color(u32::from(b) << 16 | u32::from(g) << 8 | u32::from(r))
     }
+
+    pub fn white() -> Color {
+        Color::rgb(255, 255, 255)
+    }
+
+    pub fn red() -> Color {
+        Color::rgb(255, 0, 0)
+    }
+
+    pub fn green() -> Color {
+        Color::rgb(0, 255, 0)
+    }
+
+    pub fn blue() -> Color {
+        Color::rgb(0, 0, 255)
+    }
 }
 
 #[derive(PartialEq)]
@@ -124,15 +140,15 @@ impl Display {
         self.write_pixel_component(x, y, 2, (color >> 16) & 0xff);
     }
 
-    pub fn rect(&mut self, x1: u32, y1: u32, x2: u32, y2: u32, color: u32) {
+    pub fn rect(&mut self, x1: u32, y1: u32, x2: u32, y2: u32, color: Color) {
         for y in y1..y2 {
             for x in x1..x2 {
-                self.putpixel(x, y, color);
+                self.putpixel(x, y, color.0);
             }
         }
     }
 
-    pub fn draw_text(&mut self, x: u32, y: u32, text: &str, color: u32) {
+    pub fn draw_text(&mut self, x: u32, y: u32, text: &str, color: Color) {
         for i in 0..8 {
             // Take an 8 bit slice from each array value.
             for (char_off, my_char) in text.as_bytes().iter().enumerate() {
@@ -148,7 +164,7 @@ impl Display {
                 myval >>= i * 8;
                 for mycount in 0..8 {
                     if myval & 1 == 1 {
-                        self.putpixel(x + off + mycount, y + i, color);
+                        self.putpixel(x + off + mycount, y + i, color.0);
                     }
                     myval >>= 1;
                     if myval == 0 {