From 3bd4a54aa2c41e83075ce9597b5d1cacc587e3ad Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Sat, 16 Jul 2022 01:01:05 +0200
Subject: [PATCH] reformat

---
 c_os/devices/BufferedCGA.h    |  1 +
 c_os/devices/Keyboard.cc      | 20 --------------------
 c_os/user/demo/HeapDemo.cc    |  6 +++---
 c_os/user/demo/HeapDemo.h     |  1 -
 c_os/user/demo/KeyboardDemo.h |  4 ++--
 5 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/c_os/devices/BufferedCGA.h b/c_os/devices/BufferedCGA.h
index 4cf9db0..0ff9fc6 100755
--- a/c_os/devices/BufferedCGA.h
+++ b/c_os/devices/BufferedCGA.h
@@ -12,6 +12,7 @@ private:
     std::unique_ptr<ScrollbackBuffer> scrollback_buffer;  // Contains previous pages
     std::unique_ptr<CGA::cga_page_t> screen_buffer;       // Contains the current page separately from the scrollback.
     bool initialized;                                     // Don't do ScrollbackBuffer actions if not initialized
+                                                          // TODO: Just check if pointers have value
 
     BufferedCGA(const BufferedCGA&) = delete;
 
diff --git a/c_os/devices/Keyboard.cc b/c_os/devices/Keyboard.cc
index 0c246ae..88cb966 100755
--- a/c_os/devices/Keyboard.cc
+++ b/c_os/devices/Keyboard.cc
@@ -341,26 +341,6 @@ void Keyboard::trigger() {
     if (key.ctrl_left() && key.alt_left() && (char)key == 'r') {
         this->reboot();
     }
-    // TODO: Make a scrollback demo
-    // else if ((char)key == 'k' || (char)key == 'j') {
-    //     scroll_mode(key);
-    // }
 
     kevman.broadcast(key);
 }
-
-// TODO: Where to place this?
-//       To use keyboard interrupts from different applications more work is needed:
-//        - Ereignisverwaltung, wo man Threads registrieren kann
-//        - Blockierte Threads verwalten und aufwecken bei ereignissen
-// Waits for keys to control the scrollback buffer display
-// void scroll_mode(Key key) {
-//     switch ((char)key) {
-//     case 'k':
-//         kout.scroll_page_backward();
-//         break;
-//     case 'j':
-//         kout.scroll_page_forward();
-//         break;
-//     }
-// }
diff --git a/c_os/user/demo/HeapDemo.cc b/c_os/user/demo/HeapDemo.cc
index 3482883..223ca31 100755
--- a/c_os/user/demo/HeapDemo.cc
+++ b/c_os/user/demo/HeapDemo.cc
@@ -19,7 +19,7 @@ void HeapDemo::run() {
 
     // Rounding to word border
     kout << "ROUNDING ====================================================================" << endl;
-    void* alloc = allocator.alloc(1); // 1 Byte
+    void* alloc = allocator.alloc(1);  // 1 Byte
     allocator.dump_free_memory();
     allocator.free(alloc);
     allocator.dump_free_memory();
@@ -32,9 +32,9 @@ void HeapDemo::run() {
     allocator.dump_free_memory();
     MyObj* c = new MyObj(15);
     allocator.dump_free_memory();
-    delete b; // No merge
+    delete b;  // No merge
     allocator.dump_free_memory();
-    delete a; // Merge forward
+    delete a;  // Merge forward BUG: Bluescreen
     allocator.dump_free_memory();
     delete c;
     allocator.dump_free_memory();
diff --git a/c_os/user/demo/HeapDemo.h b/c_os/user/demo/HeapDemo.h
index f66f2d5..46f5575 100755
--- a/c_os/user/demo/HeapDemo.h
+++ b/c_os/user/demo/HeapDemo.h
@@ -32,5 +32,4 @@ public:
     void run() override;
 };
 
-
 #endif
diff --git a/c_os/user/demo/KeyboardDemo.h b/c_os/user/demo/KeyboardDemo.h
index bbccc8c..2afcdfb 100755
--- a/c_os/user/demo/KeyboardDemo.h
+++ b/c_os/user/demo/KeyboardDemo.h
@@ -13,7 +13,7 @@
 
 #include "kernel/Globals.h"
 #include "kernel/threads/Thread.h"
-#include "user/KeyEventListener.h"
+#include "user/event/KeyEventListener.h"
 
 class KeyboardDemo : public Thread {
 private:
@@ -24,7 +24,7 @@ private:
 public:
     KeyboardDemo() : listener(*this) {
         kout << "Initialized KeyboardDemo" << endl;
-        kevman.subscribe(listener);
+        kevman.subscribe(this->listener);
     }
 
     void run() override;