From 0a5416a87ac12a45e682346d0e6ec1a2eff6178f Mon Sep 17 00:00:00 2001 From: Liav A Date: Tue, 20 Sep 2022 22:44:48 +0300 Subject: [PATCH] Kernel: Mark Console::{hide,show}_cursor methods protected Only the Console code in the Graphics directory should be able to call on these methods. The set_cursor method stays public as VirtualConsole uses that method to change the cursor position. --- Kernel/Graphics/Console/Console.h | 5 +++-- Kernel/Graphics/Console/GenericFramebufferConsole.h | 5 +++-- Kernel/Graphics/Console/VGATextModeConsole.h | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Kernel/Graphics/Console/Console.h b/Kernel/Graphics/Console/Console.h index afaef18e550..d55896101a2 100644 --- a/Kernel/Graphics/Console/Console.h +++ b/Kernel/Graphics/Console/Console.h @@ -50,8 +50,6 @@ public: virtual bool has_hardware_cursor() const = 0; virtual void set_cursor(size_t x, size_t y) = 0; - virtual void hide_cursor() = 0; - virtual void show_cursor() = 0; virtual void clear(size_t x, size_t y, size_t length) = 0; virtual void write(size_t x, size_t y, char ch, Color background, Color foreground, bool critical = false) = 0; @@ -62,6 +60,9 @@ public: virtual ~Console() = default; protected: + virtual void hide_cursor() = 0; + virtual void show_cursor() = 0; + Console(size_t width, size_t height) : m_width(width) , m_height(height) diff --git a/Kernel/Graphics/Console/GenericFramebufferConsole.h b/Kernel/Graphics/Console/GenericFramebufferConsole.h index 953f694b677..0b38e430978 100644 --- a/Kernel/Graphics/Console/GenericFramebufferConsole.h +++ b/Kernel/Graphics/Console/GenericFramebufferConsole.h @@ -24,8 +24,6 @@ public: virtual bool has_hardware_cursor() const override { return false; } virtual void set_cursor(size_t x, size_t y) override; - virtual void hide_cursor() override; - virtual void show_cursor() override; virtual void clear(size_t x, size_t y, size_t length) override; virtual void write(size_t x, size_t y, char ch, Color background, Color foreground, bool critical = false) override; @@ -38,6 +36,9 @@ public: virtual void set_resolution(size_t width, size_t height, size_t pitch) = 0; protected: + virtual void hide_cursor() override; + virtual void show_cursor() override; + GenericFramebufferConsoleImpl(size_t width, size_t height, size_t pitch) : Console(width, height) , m_pitch(pitch) diff --git a/Kernel/Graphics/Console/VGATextModeConsole.h b/Kernel/Graphics/Console/VGATextModeConsole.h index 75a669771a6..e67125b2dcb 100644 --- a/Kernel/Graphics/Console/VGATextModeConsole.h +++ b/Kernel/Graphics/Console/VGATextModeConsole.h @@ -21,8 +21,6 @@ public: virtual size_t bytes_per_base_glyph() const override { return 2; } virtual void set_cursor(size_t x, size_t y) override; - virtual void hide_cursor() override; - virtual void show_cursor() override; virtual void clear(size_t x, size_t y, size_t length) override; virtual void write(size_t x, size_t y, char ch, bool critical = false) override; virtual void write(size_t x, size_t y, char ch, Color background, Color foreground, bool critical = false) override; @@ -33,6 +31,9 @@ public: virtual void disable() override { } private: + virtual void hide_cursor() override; + virtual void show_cursor() override; + void clear_vga_row(u16 row); explicit VGATextModeConsole(NonnullOwnPtr);