Kernel: KeyEvent is now well known keycode

Keycodes are easier to handle as you need only one keyboard layout for keycodes. Otherwise you would need to implement keyboard layout for every keyboard driver in every language.
2024-01-10 01:29:37 +02:00
parent e4f48cbc73
commit 961ab9768a
12 changed files with 981 additions and 489 deletions
--- a/kernel/include/kernel/Input/KeyEvent.h
+++ b/kernel/include/kernel/Input/KeyEvent.h
@@ -5,6 +5,47 @@
 namespace Kernel::Input
 {

+	/*
+		Key Code:
+			bits 4:0 column (from left)
+			bits 7:5 row    (from top)
+	*/
+
+	#define BANAN_CONSTEVAL_STATIC_ASSERT(cond) do { int dummy = 1 / (cond); } while (false)
+
+	consteval uint8_t keycode_function(uint8_t index)
+	{
+		BANAN_CONSTEVAL_STATIC_ASSERT(index <= 0b11111);
+		return index;
+	}
+
+	consteval uint8_t keycode_normal(uint8_t row, uint8_t col)
+	{
+		BANAN_CONSTEVAL_STATIC_ASSERT(row <= 0b111 - 1);
+		BANAN_CONSTEVAL_STATIC_ASSERT(col < 0b11111 - 8);
+		return ((row + 1) << 5) | col;
+	}
+
+	consteval uint8_t keycode_numpad(uint8_t row, uint8_t col)
+	{
+		BANAN_CONSTEVAL_STATIC_ASSERT(row <= 0b111 - 1);
+		BANAN_CONSTEVAL_STATIC_ASSERT(col <= 8);
+		return ((row + 1) << 5) | (col + 0b11111 - 8);
+	}
+
+	enum ModifierKeycode
+	{
+		CapsLock	= keycode_normal(2, 0),
+		NumLock		= keycode_numpad(0, 0),
+		ScrollLock	= keycode_function(20),
+		LShift		= keycode_normal(3, 0),
+		RShift		= keycode_normal(3, 12),
+		LCtrl		= keycode_normal(4, 0),
+		RCtrl		= keycode_normal(4, 5),
+		LAlt		= keycode_normal(4, 2),
+		RAlt		= keycode_normal(4, 4),
+	};
+
 	enum class Key
 	{
 		Invalid, None,
@@ -14,9 +55,9 @@ namespace Kernel::Input
 		F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
 		Insert, PrintScreen, Delete, Home, End, PageUp, PageDown, Enter, Space,
 		ExclamationMark, DoubleQuote, Hashtag, Currency, Percent, Ampersand, Slash, Section, Half,
-		OpenBracet, CloseBracet, OpenBrace, CloseBrace, OpenCurlyBrace, CloseCurlyBrace,
-		Equals, QuestionMark, Plus, BackSlash, Acute, BackTick, TwoDots, Backspace, AtSign, Pound, Dollar, Euro,
-		Escape, Tab, CapsLock, LeftShift, LeftCtrl, Super, Alt, AltGr, RightCtrl, RightShift,
+		OpenParenthesis, CloseParenthesis, OpenSquareBracket, CloseSquareBracket, OpenCurlyBracket, CloseCurlyBracket,
+		Equals, QuestionMark, Plus, BackSlash, Acute, BackTick, TwoDots, Cedilla, Backspace, AtSign, Pound, Dollar, Euro,
+		Escape, Tab, CapsLock, LeftShift, LeftCtrl, Super, LeftAlt, RightAlt, AltGr = RightAlt, RightCtrl, RightShift,
 		SingleQuote, Asterix, Caret, Tilde, ArrowUp, ArrowDown, ArrowLeft, ArrowRight,
 		Comma, Semicolon, Period, Colon, Hyphen, Underscore, NumLock, ScrollLock, LessThan, GreaterThan, Pipe,
 		Numpad0, Numpad1, Numpad2, Numpad3, Numpad4, Numpad5, Numpad6, Numpad7, Numpad8, Numpad9,
@@ -27,73 +68,44 @@ namespace Kernel::Input

 	struct KeyEvent
 	{
-		enum class Modifier : uint8_t
+		enum Modifier : uint16_t
 		{
-			Shift		= (1 << 0),
-			Ctrl		= (1 << 1),
-			Alt			= (1 << 2),
-			AltGr		= (1 << 3),
-			CapsLock	= (1 << 4),
-			NumLock		= (1 << 5),
-			ScrollLock	= (1 << 6),
-			Released	= (1 << 7),
+			LShift		= (1 << 0),
+			RShift		= (1 << 1),
+			LCtrl		= (1 << 2),
+			RCtrl		= (1 << 3),
+			LAlt		= (1 << 4),
+			RAlt		= (1 << 5),
+			CapsLock	= (1 << 6),
+			NumLock		= (1 << 7),
+			ScrollLock	= (1 << 8),
+			Pressed		= (1 << 9),
 		};

-		bool shift()		const { return modifier & (uint8_t)Modifier::Shift; }
-		bool ctrl()			const { return modifier & (uint8_t)Modifier::Ctrl; }
-		bool alt()			const { return modifier & (uint8_t)Modifier::Alt; }
-		bool altgr()		const { return modifier & (uint8_t)Modifier::AltGr; }
-		bool caps_lock()	const { return modifier & (uint8_t)Modifier::CapsLock; }
-		bool num_lock()		const { return modifier & (uint8_t)Modifier::NumLock; }
-		bool scroll_lock()	const { return modifier & (uint8_t)Modifier::ScrollLock; }
-		bool released()		const { return modifier & (uint8_t)Modifier::Released; }
-		bool pressed()		const { return !released(); }
+		bool lshift()		const { return modifier & Modifier::LShift; }
+		bool rshift()		const { return modifier & Modifier::RShift; }
+		bool shift()		const { return lshift() || rshift(); }

-		uint8_t modifier;
-		Key key;
+		bool lctrl()		const { return modifier & Modifier::LCtrl; }
+		bool rctrl()		const { return modifier & Modifier::RCtrl; }
+		bool ctrl()			const { return lctrl() || rctrl(); }
+
+		bool lalt()			const { return modifier & Modifier::LAlt; }
+		bool ralt()			const { return modifier & Modifier::RAlt; }
+		bool alt()			const { return lalt() || ralt(); }
+
+		bool caps_lock()	const { return modifier & Modifier::CapsLock; }
+		bool num_lock()		const { return modifier & Modifier::NumLock; }
+		bool scroll_lock()	const { return modifier & Modifier::ScrollLock; }
+
+		bool pressed()		const { return modifier & Modifier::Pressed; }
+		bool released()		const { return !pressed(); }
+
+		uint16_t modifier;
+		uint8_t keycode;
 	};

-	inline const char* key_event_to_utf8(KeyEvent event)
-	{
-		static constexpr const char* utf8_lower[] = {
-			nullptr, nullptr,
-			"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-			"å", "ä", "ö",
-			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, " ",
-			"!", "\"", "#", "¤", "%", "&", "/", "§", "½",
-			"(", ")", "[", "]", "{", "}",
-			"=", "?", "+", "\\", "´", "`", "¨", nullptr, "@", "£", "$", "€",
-			nullptr, "\t", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			"'", "*", "^", "~", nullptr, nullptr, nullptr, nullptr,
-			",", ";", ".", ":", "-", "_", nullptr, nullptr, "<", ">", "|",
-			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-			"+", "-", "*", "/", nullptr, ",",
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-		};
-		static_assert((size_t)Key::Count == sizeof(utf8_lower) / sizeof(*utf8_lower));
-
-		static constexpr const char* utf8_upper[] = {
-			nullptr, nullptr,
-			"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
-			"Å", "Ä", "Ö",
-			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, " ",
-			"!", "\"", "#", "¤", "%", "&", "/", "§", "½",
-			"(", ")", "[", "]", "{", "}",
-			"=", "?", "+", "\\", "´", "`", "¨", nullptr, "@", "£", "$", "€",
-			nullptr, "\t", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-			"'", "*", "^", "~", nullptr, nullptr, nullptr, nullptr,
-			",", ";", ".", ":", "-", "_", nullptr, nullptr, "<", ">", "|",
-			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-			"+", "-", "*", "/", nullptr, ",",
-			nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-		};
-		static_assert((size_t)Key::Count == sizeof(utf8_upper) / sizeof(*utf8_lower));
-
-		return (event.shift() ^ event.caps_lock()) ? utf8_upper[(uint8_t)event.key] : utf8_lower[(uint8_t)event.key];
-	}
+	Key key_event_to_key(KeyEvent);
+	const char* key_to_utf8(Key key, uint16_t modifier);

 }
--- a/kernel/include/kernel/Input/KeyboardLayouts/FI.h
+++ b/kernel/include/kernel/Input/KeyboardLayouts/FI.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace Kernel::Input::KeyboardLayout
+{
+	
+	void initialize_fi();
+
+}
--- a/kernel/include/kernel/Input/PS2/Config.h
+++ b/kernel/include/kernel/Input/PS2/Config.h
@@ -78,13 +78,6 @@ namespace Kernel::Input::PS2
 		KEY_ERROR_OR_BUFFER_OVERRUN2 = 0xFF,
 	};

-	enum KBScancode : uint8_t
-	{
-		SET_SCANCODE_SET1 = 1,
-		SET_SCANCODE_SET2 = 2,
-		SET_SCANCODE_SET3 = 3,
-	};
-
 	enum KBLeds : uint8_t
 	{
 		SCROLL_LOCK	= (1 << 0),
--- a/kernel/include/kernel/Input/PS2/Keyboard.h
+++ b/kernel/include/kernel/Input/PS2/Keyboard.h
@@ -1,5 +1,7 @@
 #pragma once

+#include <BAN/Array.h>
+#include <BAN/CircularQueue.h>
 #include <kernel/Input/KeyEvent.h>
 #include <kernel/Input/PS2/Device.h>
 #include <kernel/Input/PS2/Keymap.h>
@@ -14,7 +16,7 @@ namespace Kernel::Input
 		enum Command : uint8_t
 		{
 			SET_LEDS = 0xED,
-			SCANCODE = 0xF0
+			CONFIG_SCANCODE_SET = 0xF0
 		};

 	public:
@@ -29,12 +31,14 @@ namespace Kernel::Input
 		void update_leds();

 	private:
-		uint8_t m_byte_buffer[10];
+		BAN::Array<uint8_t, 3> m_byte_buffer;
 		uint8_t m_byte_index { 0 };

-		uint8_t m_modifiers { 0 };
+		uint8_t m_scancode_set { 0xFF };

-		BAN::CircularQueue<KeyEvent, 10> m_event_queue;
+		uint16_t m_modifiers { 0 };
+
+		BAN::CircularQueue<KeyEvent, 50> m_event_queue;

 		PS2Keymap m_keymap;

--- a/kernel/include/kernel/Input/PS2/Keymap.h
+++ b/kernel/include/kernel/Input/PS2/Keymap.h
@@ -1,7 +1,7 @@
 #pragma once

-#include <BAN/Vector.h>
-#include <kernel/Input/KeyEvent.h>
+#include <BAN/Array.h>
+#include <BAN/Optional.h>

 namespace Kernel::Input
 {
@@ -9,15 +9,18 @@ namespace Kernel::Input
 	class PS2Keymap
 	{
 	public:
-		PS2Keymap();
+		void initialize(uint8_t scancode_set);

-		Key key_for_scancode_and_modifiers(uint32_t, uint8_t);
+		BAN::Optional<uint8_t> get_keycode(uint8_t scancode, bool extended) const;

 	private:
-		BAN::Vector<Key> m_normal_keymap;
-		BAN::Vector<Key> m_shift_keymap;
-		BAN::Vector<Key> m_altgr_keymap;
-		BAN::Vector<Key> m_extended_keymap;
+		void initialize_scancode_set1();
+		void initialize_scancode_set2();
+		void initialize_scancode_set3();
+
+	private:
+		BAN::Array<uint8_t, 0xFF> m_scancode_to_keycode_normal;
+		BAN::Array<uint8_t, 0xFF> m_scancode_to_keycode_extended;
 	};

 }