RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:07:34 +00:00
Code Issues Activity Actions

WindowServer+Keymap+LibGUI: Add widget to display current keymap

Browse source
This commit is contained in:
Timur Sultanov 2022-01-19 14:44:56 +03:00 • committed by Andreas Kling
parent 68a01f0e27
commit b9c558f6c6
14 changed files with 160 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Services/WindowServer/KeymapSwitcher.cpp
View file

@ -12,17 +12,8 @@
namespace WindowServer {
static KeymapSwitcher* s_the;
KeymapSwitcher& KeymapSwitcher::the()
{
VERIFY(s_the);
return *s_the;
}
KeymapSwitcher::KeymapSwitcher()
{
s_the = this;
}
KeymapSwitcher::~KeymapSwitcher()
@ -80,10 +71,7 @@ String KeymapSwitcher::get_current_keymap() const
auto json = JsonValue::from_string(proc_keymap->read_all()).release_value_but_fixme_should_propagate_errors();
auto const& keymap_object = json.as_object();
VERIFY(keymap_object.has("keymap"));
auto keymap = keymap_object.get("keymap").to_string();
dbgln("Current keymap is: {}", keymap);
return keymap;
return keymap_object.get("keymap").to_string();
}
void KeymapSwitcher::setkeymap(const AK::String& keymap)
@ -94,6 +82,8 @@ void KeymapSwitcher::setkeymap(const AK::String& keymap)
perror("posix_spawn");
dbgln("Failed to call /bin/keymap, error: {} ({})", errno, strerror(errno));
}
if (on_keymap_change)
on_keymap_change(keymap);
}
}