1
This commit is contained in:
2022-07-16 01:01:05 +02:00
parent 15dd858d33
commit 3bd4a54aa2
5 changed files with 6 additions and 26 deletions

View File

@ -12,6 +12,7 @@ private:
std::unique_ptr<ScrollbackBuffer> scrollback_buffer; // Contains previous pages 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. 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 bool initialized; // Don't do ScrollbackBuffer actions if not initialized
// TODO: Just check if pointers have value
BufferedCGA(const BufferedCGA&) = delete; BufferedCGA(const BufferedCGA&) = delete;

View File

@ -341,26 +341,6 @@ void Keyboard::trigger() {
if (key.ctrl_left() && key.alt_left() && (char)key == 'r') { if (key.ctrl_left() && key.alt_left() && (char)key == 'r') {
this->reboot(); this->reboot();
} }
// TODO: Make a scrollback demo
// else if ((char)key == 'k' || (char)key == 'j') {
// scroll_mode(key);
// }
kevman.broadcast(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;
// }
// }

View File

@ -34,7 +34,7 @@ void HeapDemo::run() {
allocator.dump_free_memory(); allocator.dump_free_memory();
delete b; // No merge delete b; // No merge
allocator.dump_free_memory(); allocator.dump_free_memory();
delete a; // Merge forward delete a; // Merge forward BUG: Bluescreen
allocator.dump_free_memory(); allocator.dump_free_memory();
delete c; delete c;
allocator.dump_free_memory(); allocator.dump_free_memory();

View File

@ -32,5 +32,4 @@ public:
void run() override; void run() override;
}; };
#endif #endif

View File

@ -13,7 +13,7 @@
#include "kernel/Globals.h" #include "kernel/Globals.h"
#include "kernel/threads/Thread.h" #include "kernel/threads/Thread.h"
#include "user/KeyEventListener.h" #include "user/event/KeyEventListener.h"
class KeyboardDemo : public Thread { class KeyboardDemo : public Thread {
private: private:
@ -24,7 +24,7 @@ private:
public: public:
KeyboardDemo() : listener(*this) { KeyboardDemo() : listener(*this) {
kout << "Initialized KeyboardDemo" << endl; kout << "Initialized KeyboardDemo" << endl;
kevman.subscribe(listener); kevman.subscribe(this->listener);
} }
void run() override; void run() override;