RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:37:47 +00:00
Code Issues Activity Actions

LibKeyboard+keymap: Support querying the keymap via commandline

Browse source
This commit is contained in:
Ben Wiederhake 2021-01-30 22:01:34 +01:00 • committed by Andreas Kling
parent a2c21a55e1
commit dd4e670f72
4 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,17 +33,23 @@
namespace Keyboard {
CharacterMap::CharacterMap(const String& file_name)
CharacterMap::CharacterMap(const String& map_name)
{
#ifdef KERNEL
m_character_map_data = default_character_map;
#else
auto result = CharacterMapFile::load_from_file(file_name);
auto result = CharacterMapFile::load_from_file(map_name);
ASSERT(result.has_value());
m_character_map_data = result.value();
#endif
m_character_map_name = file_name;
m_character_map_name = map_name;
}
CharacterMap::CharacterMap(const String& map_name, const CharacterMapData& map_data)
: m_character_map_data(map_data)
, m_character_map_name(map_name)
{
}
#ifndef KERNEL
@ -54,6 +60,26 @@ int CharacterMap::set_system_map()
return syscall(SC_setkeymap, &params);
}
Result<CharacterMap, OSError> CharacterMap::fetch_system_map()
{
CharacterMapData map_data;
char keymap_name[50 + 1] = { 0 };
Syscall::SC_getkeymap_params params {
map_data.map, map_data.shift_map,
map_data.alt_map,
map_data.altgr_map,
map_data.shift_altgr_map,
{ keymap_name, sizeof(keymap_name) }
};
int rc = syscall(SC_getkeymap, &params);
if (rc < 0) {
return OSError(-rc);
}
return CharacterMap { keymap_name, map_data };
}
#endif
u32 CharacterMap::get_char(KeyEvent event)

8
Userland/Libraries/LibKeyboard/CharacterMap.h
View file

@ -26,6 +26,10 @@
#pragma once
#ifndef KERNEL
# include <AK/OSError.h>
# include <AK/Result.h>
#endif
#include <AK/String.h>
#include <Kernel/API/KeyCode.h>
#include <LibKeyboard/CharacterMapData.h>
@ -35,10 +39,12 @@ namespace Keyboard {
class CharacterMap {
public:
CharacterMap(const String& file_name);
CharacterMap(const String& map_name);
CharacterMap(const String& map_name, const CharacterMapData& map_data);
#ifndef KERNEL
int set_system_map();
static Result<CharacterMap, OSError> fetch_system_map();
#endif
u32 get_char(KeyEvent);