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

Kernel+LibKeyboard: Store the keymap name when setting system keymap

Browse source 
This way we can query the kernel to see which keymap is currently in use.
This commit is contained in:
Valtteri Koskivuori 2020-08-06 02:03:32 +03:00 • committed by Andreas Kling
parent 8dd0c391e9
commit 00a0e525e6
6 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Devices/KeyboardDevice.cpp
View file

@ -391,10 +391,11 @@ KeyboardClient::~KeyboardClient()
{
}
void KeyboardDevice::set_maps(Keyboard::CharacterMapData character_map_data)
void KeyboardDevice::set_maps(const Keyboard::CharacterMapData& character_map_data, const String& character_map_name)
{
m_character_map.set_character_map_data(character_map_data);
dbg() << "New Character map passing to client.";
m_character_map.set_character_map_name(character_map_name);
dbg() << "New Character map \"" << character_map_name << "\" passing to client.";
}
}

4
Kernel/Devices/KeyboardDevice.h
View file

@ -51,7 +51,9 @@ public:
KeyboardDevice();
void set_client(KeyboardClient* client) { m_client = client; }
void set_maps(Keyboard::CharacterMapData character_map);
void set_maps(const Keyboard::CharacterMapData& character_map, const String& character_map_name);
const String keymap_name() { return m_character_map.character_map_name(); }
// ^CharacterDevice
virtual KResultOr<size_t> read(FileDescription&, size_t, u8*, size_t) override;