diff --git a/kernel/include/kernel/Input/KeyEvent.h b/kernel/include/kernel/Input/KeyEvent.h index 77fec1131a..b24b029456 100644 --- a/kernel/include/kernel/Input/KeyEvent.h +++ b/kernel/include/kernel/Input/KeyEvent.h @@ -59,7 +59,7 @@ namespace Kernel::Input 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, + Comma, Semicolon, Period, Colon, Hyphen, Underscore, NumLock, ScrollLock, LessThan, GreaterThan, Pipe, Negation, BrokenBar, Numpad0, Numpad1, Numpad2, Numpad3, Numpad4, Numpad5, Numpad6, Numpad7, Numpad8, Numpad9, NumpadPlus, NumpadMinus, NumpadMultiply, NumpadDivide, NumpadEnter, NumpadDecimal, VolumeMute, VolumeUp, VolumeDown, Calculator, MediaPlayPause, MediaStop, MediaPrevious, MediaNext, diff --git a/kernel/kernel/Input/KeyEvent.cpp b/kernel/kernel/Input/KeyEvent.cpp index 0c34267db7..2806af1bd7 100644 --- a/kernel/kernel/Input/KeyEvent.cpp +++ b/kernel/kernel/Input/KeyEvent.cpp @@ -24,7 +24,7 @@ namespace Kernel::Input "=", "?", "+", "\\", "´", "`", "¨", "¸", nullptr, "@", "£", "$", "€", nullptr, "\t", nullptr, nullptr, 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, @@ -43,7 +43,7 @@ namespace Kernel::Input "=", "?", "+", "\\", "´", "`", "¨", "¸", nullptr, "@", "£", "$", "€", nullptr, "\t", nullptr, nullptr, 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, diff --git a/kernel/kernel/Input/KeyboardLayout.cpp b/kernel/kernel/Input/KeyboardLayout.cpp index b05208a277..ed80ff0aa1 100644 --- a/kernel/kernel/Input/KeyboardLayout.cpp +++ b/kernel/kernel/Input/KeyboardLayout.cpp @@ -205,6 +205,7 @@ namespace Kernel::Input TRY(s_name_to_key.insert("BackSlash"sv, Key::BackSlash)); TRY(s_name_to_key.insert("Backspace"sv, Key::Backspace)); TRY(s_name_to_key.insert("BackTick"sv, Key::BackTick)); + TRY(s_name_to_key.insert("BrokenBar"sv, Key::BrokenBar)); TRY(s_name_to_key.insert("C"sv, Key::C)); TRY(s_name_to_key.insert("Calculator"sv, Key::Calculator)); TRY(s_name_to_key.insert("CapsLock"sv, Key::CapsLock)); @@ -276,6 +277,7 @@ namespace Kernel::Input TRY(s_name_to_key.insert("MediaPrevious"sv, Key::MediaPrevious)); TRY(s_name_to_key.insert("MediaStop"sv, Key::MediaStop)); TRY(s_name_to_key.insert("N"sv, Key::N)); + TRY(s_name_to_key.insert("Negation"sv, Key::Negation)); TRY(s_name_to_key.insert("None"sv, Key::None)); TRY(s_name_to_key.insert("NumLock"sv, Key::NumLock)); TRY(s_name_to_key.insert("Numpad0"sv, Key::Numpad0)); diff --git a/kernel/kernel/Input/PS2/Keyboard.cpp b/kernel/kernel/Input/PS2/Keyboard.cpp index f20fe94c4a..97de531307 100644 --- a/kernel/kernel/Input/PS2/Keyboard.cpp +++ b/kernel/kernel/Input/PS2/Keyboard.cpp @@ -150,7 +150,7 @@ namespace Kernel::Input m_modifiers |= modifier_mask; } - if (toggle_mask) + if (toggle_mask && !released) { m_modifiers ^= toggle_mask; update_leds();