LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-06 11:09:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

KeyboardSettings: Allow changing and applying active keymap

Browse Source 
Previously only the list of allowed keymaps could be modified and
applied to the system.

Add a new button to activate the selected keymap from the list. When
applying the changes to the system, also apply the active keymap.
This commit is contained in:
Nícolas F. R. A. Prado 2022-02-24 22:17:44 -05:00 committed by Andreas Kling
parent a48d7d6adc
commit 2c44c7fc89
Notes: sideshowbarker 2024-07-17 16:56:17 +09:00 
Author: https://github.com/nfraprado
Commit: https://github.com/SerenityOS/serenity/commit/2c44c7fc89
Pull-request: https://github.com/SerenityOS/serenity/pull/12764
Reviewed-by: https://github.com/davidot
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Userland/Applications/KeyboardSettings/Keyboard.gml
View File

@ -39,6 +39,12 @@
spacing: 4
}
@GUI::Button {
name: "activate_keymap_button"
text: "Activate keymap"
enabled: false
}
@GUI::Button {
name: "add_keymap_button"
text: "Add keymap"

39
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.cpp
View File

@ -135,6 +135,13 @@ public:
invalidate();
}
String const& active_keymap() { return m_active_keymap; }
String const& keymap_at(size_t index)
{
return m_data[index];
}
Vector<String> const& keymaps() const { return m_data; }
private:
@ -173,6 +180,15 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
keymaps_list_model.set_active_keymap(m_initial_active_keymap);
m_activate_keymap_button = find_descendant_of_type_named<GUI::Button>("activate_keymap_button");
m_activate_keymap_button->on_click = [&](auto) {
auto& selection = m_selected_keymaps_listview->selection();
if (!selection.is_empty()) {
auto& selected_keymap = keymaps_list_model.keymap_at(selection.first().row());
keymaps_list_model.set_active_keymap(selected_keymap);
}
};
m_add_keymap_button = find_descendant_of_type_named<GUI::Button>("add_keymap_button");
m_add_keymap_button->on_click = [&](auto) {
@ -185,23 +201,29 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
m_remove_keymap_button->on_click = [&](auto) {
auto& selection = m_selected_keymaps_listview->selection();
bool active_keymap_deleted = false;
for (auto& index : selection.indices()) {
if (keymaps_list_model.keymap_at(index.row()) == keymaps_list_model.active_keymap())
active_keymap_deleted = true;
keymaps_list_model.remove_at(index.row());
}
if (active_keymap_deleted)
keymaps_list_model.set_active_keymap(keymaps_list_model.keymap_at(0));
};
m_selected_keymaps_listview->on_selection_change = [&]() {
auto& selection = m_selected_keymaps_listview->selection();
m_remove_keymap_button->set_enabled(!selection.is_empty() && keymaps_list_model.keymaps().size() > 1);
m_activate_keymap_button->set_enabled(!selection.is_empty());
};
m_test_typing_area = *find_descendant_of_type_named<GUI::TextEditor>("test_typing_area");
m_test_typing_area->on_focusin = [&]() {
set_keymaps(keymaps_list_model.keymaps());
set_keymaps(keymaps_list_model.keymaps(), keymaps_list_model.active_keymap());
};
m_test_typing_area->on_focusout = [&]() {
set_keymaps(m_initial_keymap_list);
set_keymaps(m_initial_keymap_list, m_initial_active_keymap);
};
m_clear_test_typing_area_button = find_descendant_of_type_named<GUI::Button>("button_clear_test_typing_area");
@ -216,36 +238,37 @@ KeyboardSettingsWidget::KeyboardSettingsWidget()
KeyboardSettingsWidget::~KeyboardSettingsWidget()
{
set_keymaps(m_initial_keymap_list);
set_keymaps(m_initial_keymap_list, m_initial_active_keymap);
}
void KeyboardSettingsWidget::window_activated(bool is_active_window)
{
if (is_active_window && m_test_typing_area->is_focused()) {
auto& keymaps_list_model = static_cast<KeymapModel&>(*m_selected_keymaps_listview->model());
set_keymaps(keymaps_list_model.keymaps());
set_keymaps(keymaps_list_model.keymaps(), keymaps_list_model.active_keymap());
} else {
set_keymaps(m_initial_keymap_list);
set_keymaps(m_initial_keymap_list, m_initial_active_keymap);
}
}
void KeyboardSettingsWidget::apply_settings()
{
auto& m_keymaps_list_model = static_cast<KeymapModel&>(*m_selected_keymaps_listview->model());
set_keymaps(m_keymaps_list_model.keymaps());
set_keymaps(m_keymaps_list_model.keymaps(), m_keymaps_list_model.active_keymap());
m_initial_keymap_list.clear();
for (auto& keymap : m_keymaps_list_model.keymaps()) {
m_initial_keymap_list.append(keymap);
}
m_initial_active_keymap = m_keymaps_list_model.active_keymap();
Config::write_bool("KeyboardSettings", "StartupEnable", "NumLock", m_num_lock_checkbox->is_checked());
}
void KeyboardSettingsWidget::set_keymaps(Vector<String> const& keymaps)
void KeyboardSettingsWidget::set_keymaps(Vector<String> const& keymaps, String const& active_keymap)
{
pid_t child_pid;
auto keymaps_string = String::join(',', keymaps);
const char* argv[] = { "/bin/keymap", "-s", keymaps_string.characters(), nullptr };
const char* argv[] = { "/bin/keymap", "-s", keymaps_string.characters(), "-m", active_keymap.characters(), nullptr };
if ((errno = posix_spawn(&child_pid, "/bin/keymap", nullptr, nullptr, const_cast<char**>(argv), environ))) {
perror("posix_spawn");
exit(1);

4
Userland/Applications/KeyboardSettings/KeyboardSettingsWidget.h
View File

@ -26,14 +26,16 @@ public:
private:
KeyboardSettingsWidget();
void set_keymaps(Vector<String> const& keymaps);
void set_keymaps(Vector<String> const& keymaps, String const& active_keymap);
Vector<String> m_initial_keymap_list;
String m_initial_active_keymap;
RefPtr<GUI::ListView> m_selected_keymaps_listview;
RefPtr<GUI::Label> m_active_keymap_label;
RefPtr<GUI::CheckBox> m_num_lock_checkbox;
RefPtr<GUI::Button> m_activate_keymap_button;
RefPtr<GUI::Button> m_add_keymap_button;
RefPtr<GUI::Button> m_remove_keymap_button;
RefPtr<GUI::TextEditor> m_test_typing_area;