From 0849f24628dfa301bd338010af5b5e161d336396 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Thu, 12 Apr 2018 15:12:35 +0200
Subject: [PATCH] close #2

---
 kernel-rs/src/lib.rs     | 2 +-
 kernel-rs/src/vga/mod.rs | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
index c79a30fb..b1471098 100644
--- a/kernel-rs/src/lib.rs
+++ b/kernel-rs/src/lib.rs
@@ -51,7 +51,7 @@ pub fn kmain() -> ! {
     // heap avalaible for tracking free'd frames
     memory::init_noncore();
 
-    // x86::instructions::interrupts::int3();
+    x86::instructions::interrupts::int3();
 
     // fn stack_overflow() { stack_overflow(); }
     // stack_overflow();
diff --git a/kernel-rs/src/vga/mod.rs b/kernel-rs/src/vga/mod.rs
index ba38317b..9b5c780e 100644
--- a/kernel-rs/src/vga/mod.rs
+++ b/kernel-rs/src/vga/mod.rs
@@ -180,8 +180,10 @@ impl Writer {
             }
         }
 
-        for col in 0..BUFFER_COLS / 2 {
-            self.buffer[((BUFFER_ROWS - 1) * BUFFER_COLS) + (col * 2)] = b' ';
+        for col in (0..BUFFER_COLS / 2).map(|x| x * 2) {
+            self.buffer[((BUFFER_ROWS - 1) * BUFFER_COLS) + (col)] = b' ';
+            self.buffer[((BUFFER_ROWS - 1) * BUFFER_COLS) + (col + 1)] =
+                ColorCode::new(Color::White, Color::Black).0;
         }
 
         self.buffer_pos = (BUFFER_ROWS - 1) * BUFFER_COLS;
@@ -200,7 +202,7 @@ impl fmt::Write for Writer {
 }
 
 pub fn init() {
-    set_color!(White, Cyan);
+    set_color!(Yellow, Red);
     print!(
         "{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
         format_args!("{: ^80}", r#"        ,--,               "#),
@@ -218,7 +220,6 @@ pub fn init() {
         format_args!("{: ^80}", r#"      '  ,/ ;   | .'       "#),
         format_args!("{: ^80}", r#"      '--'  `---'          "#)
     );
-    set_color!();
     unsafe {
         VGA.prompt();
     }