RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:28:12 +00:00
Code Issues Activity Actions

Kernel: Stop using LibKeyboard's CharacterMap in HIDManagement

Browse source 
This was easily done, as the Kernel and Userland don't actually share
any of the APIs exposed by it, so instead the Kernel APIs were moved to
the Kernel, and the Userland APIs stayed in LibKeyboard.

This has multiple advantages:
 * The non OOM-fallible String is not longer used for storing the
   character map name in the Kernel
 * The kernel no longer has to link to the userland LibKeyboard code
 * A lot of #ifdef KERNEL cruft can be removed from LibKeyboard
This commit is contained in:
Idan Horowitz 2022-01-21 15:22:36 +02:00 • committed by Andreas Kling
parent cecfd42916
commit 0adee378fd
7 changed files with 58 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Userland/Libraries/LibKeyboard/CharacterMap.cpp
View file

@ -6,24 +6,18 @@
#include "CharacterMap.h"
#include <AK/StringBuilder.h>
#ifndef KERNEL
# include <LibKeyboard/CharacterMapFile.h>
# include <serenity.h>
#endif
#include <LibKeyboard/CharacterMapFile.h>
#include <errno.h>
#include <serenity.h>
namespace Keyboard {
#ifndef KERNEL
// The Kernel explicitly and exclusively links only this file into it.
// Thus, we cannot even include a reference to the symbol `CharacterMapFile::load_from_file`.
ErrorOr<CharacterMap> CharacterMap::load_from_file(const String& map_name)
{
auto result = TRY(CharacterMapFile::load_from_file(map_name));
return CharacterMap(map_name, result);
}
#endif
CharacterMap::CharacterMap(const String& map_name, const CharacterMapData& map_data)
: m_character_map_data(map_data)
@ -31,8 +25,6 @@ CharacterMap::CharacterMap(const String& map_name, const CharacterMapData& map_d
{
}
#ifndef KERNEL
int CharacterMap::set_system_map()
{
return setkeymap(m_character_map_name.characters(), m_character_map_data.map, m_character_map_data.shift_map, m_character_map_data.alt_map, m_character_map_data.altgr_map, m_character_map_data.shift_altgr_map);
@ -49,55 +41,6 @@ ErrorOr<CharacterMap> CharacterMap::fetch_system_map()
return CharacterMap { keymap_name, map_data };
}
#endif
u32 CharacterMap::get_char(KeyEvent event) const
{
auto modifiers = event.modifiers();
auto index = event.scancode & 0xFF; // Index is last byte of scan code.
auto caps_lock_on = event.caps_lock_on;
u32 code_point;
if (modifiers & Mod_Alt)
code_point = m_character_map_data.alt_map[index];
else if ((modifiers & Mod_Shift) && (modifiers & Mod_AltGr))
code_point = m_character_map_data.shift_altgr_map[index];
else if (modifiers & Mod_Shift)
code_point = m_character_map_data.shift_map[index];
else if (modifiers & Mod_AltGr)
code_point = m_character_map_data.altgr_map[index];
else
code_point = m_character_map_data.map[index];
if (caps_lock_on && (modifiers == 0 || modifiers == Mod_Shift)) {
if (code_point >= 'a' && code_point <= 'z')
code_point &= ~0x20;
else if (code_point >= 'A' && code_point <= 'Z')
code_point |= 0x20;
}
if (event.e0_prefix && event.key == Key_Slash) {
// If Key_Slash (scancode = 0x35) mapped to other form "/", we fix num pad key of "/" with this case.
code_point = '/';
} else if (event.e0_prefix && event.key != Key_Return) {
// Except for `keypad-/` and 'keypad-return', all e0 scan codes are not actually characters. i.e., `keypad-0` and
// `Insert` have the same scancode except for the prefix, but insert should not have a code_point.
code_point = 0;
}
return code_point;
}
void CharacterMap::set_character_map_data(CharacterMapData character_map_data)
{
m_character_map_data = character_map_data;
}
void CharacterMap::set_character_map_name(const String& character_map_name)
{
m_character_map_name = character_map_name;
}
const String& CharacterMap::character_map_name() const
{
return m_character_map_name;