system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 02:55:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Kernel/HID: Set Caps Lock state before doing code point remapping

Browse source 
This restores Caps Lock functionality, while still ensuring that
shortcut keys are remapped correctly.
This commit is contained in:
Tim Ledbetter 2024-02-09 18:56:54 +00:00 committed by Andrew Kaster
parent c6e5581682
commit a580118e53
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Devices/HID/KeyboardDevice.cpp
View file

@ -43,14 +43,6 @@ void KeyboardDevice::handle_input_event(KeyEvent queued_event)
}
}
if (queued_event.map_entry_index != 0xFF)
queued_event.code_point = HIDManagement::the().get_char_from_character_map(queued_event, queued_event.map_entry_index);
// If using a non-QWERTY layout, queued_event.key needs to be updated to be the same as event.code_point
KeyCode mapped_key = code_point_to_key_code(queued_event.code_point);
if (mapped_key != KeyCode::Key_Invalid)
queued_event.key = mapped_key;
if (!g_caps_lock_remapped_to_ctrl && queued_event.key == Key_CapsLock && queued_event.is_press())
m_caps_lock_on = !m_caps_lock_on;
@ -61,6 +53,14 @@ void KeyboardDevice::handle_input_event(KeyEvent queued_event)
update_modifier(Mod_Ctrl, m_caps_lock_to_ctrl_pressed);
}
if (queued_event.map_entry_index != 0xFF)
queued_event.code_point = HIDManagement::the().get_char_from_character_map(queued_event, queued_event.map_entry_index);
// If using a non-QWERTY layout, queued_event.key needs to be updated to be the same as event.code_point
KeyCode mapped_key = code_point_to_key_code(queued_event.code_point);
if (mapped_key != KeyCode::Key_Invalid)
queued_event.key = mapped_key;
{
SpinlockLocker locker(HIDManagement::the().m_client_lock);
if (HIDManagement::the().m_client)