1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 22:37:35 +00:00

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

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

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);
}
}

View file

@ -11,27 +11,29 @@
#include <AK/WeakPtr.h>
#include <LibCore/Object.h>
#include <LibKeyboard/CharacterMap.h>
#include <WindowServer/WMClientConnection.h>
namespace WindowServer {
class KeymapSwitcher final : public Core::Object {
C_OBJECT(KeymapSwitcher)
public:
static KeymapSwitcher& the();
virtual ~KeymapSwitcher() override;
void refresh();
void next_keymap();
Function<void(String const& keymap)> on_keymap_change;
String get_current_keymap() const;
private:
KeymapSwitcher();
Vector<AK::String> m_keymaps;
void setkeymap(AK::String const&);
String get_current_keymap() const;
};
}

View file

@ -36,6 +36,7 @@ enum WMEventMask {
WindowIconChanges = 1 << 2,
WindowRemovals = 1 << 3,
WorkspaceChanges = 1 << 4,
KeymapChanged = 1 << 5,
};
enum class WindowTileType {

View file

@ -53,6 +53,18 @@ WindowManager::WindowManager(Gfx::PaletteImpl const& palette)
reload_config();
m_keymap_switcher->on_keymap_change = [&](String const& keymap) {
for_each_window_manager([&keymap](WMClientConnection& conn) {
if (!(conn.event_mask() & WMEventMask::KeymapChanged))
return IterationDecision::Continue;
if (conn.window_id() < 0)
return IterationDecision::Continue;
conn.async_keymap_changed(conn.window_id(), keymap);
return IterationDecision::Continue;
});
};
Compositor::the().did_construct_window_manager({});
}

View file

@ -10,4 +10,5 @@ endpoint WindowManagerClient
super_key_pressed(i32 wm_id) =|
super_space_key_pressed(i32 wm_id) =|
workspace_changed(i32 wm_id, u32 row, u32 column) =|
keymap_changed(i32 wm_id, [UTF8] String keymap) =|
}