Skip to content

KeyboardManager: add model support #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2025
Merged

KeyboardManager: add model support #2328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ec6f6
KeyboardManager: add model support
lenemter Mar 23, 2025
fb08aa0
Merge branch 'main' into lenemter/add-model-support
lenemter Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions src/KeyboardManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class Gala.KeyboardManager : Object {
};

private static KeyboardManager? instance;
private static VariantType sources_variant_type;
private static GLib.Settings settings;

public unowned Meta.Display display { construct; private get; }
Expand All @@ -28,8 +27,6 @@ public class Gala.KeyboardManager : Object {
}

static construct {
sources_variant_type = new VariantType ("a(ss)");

var schema = GLib.SettingsSchemaSource.get_default ().lookup ("org.gnome.desktop.input-sources", true);
if (schema == null) {
critical ("org.gnome.desktop.input-sources not found.");
Expand Down Expand Up @@ -58,9 +55,6 @@ public class Gala.KeyboardManager : Object {
#endif

var sources = settings.get_value ("sources");
if (!sources.is_of_type (sources_variant_type)) {
return true;
}

var n_sources = (uint) sources.n_children ();
if (n_sources < 2) {
Expand All @@ -80,14 +74,12 @@ public class Gala.KeyboardManager : Object {

[CCode (instance_pos = -1)]
private void set_keyboard_layout (GLib.Settings settings, string key) {
if (key == "sources" || key == "xkb-options") {
unowned var backend = display.get_context ().get_backend ();

if (key == "sources" || key == "xkb-options" || key == "xkb-model") {
string[] layouts = {}, variants = {};

var sources = settings.get_value ("sources");
if (!sources.is_of_type (sources_variant_type)) {
return;
}

for (int i = 0; i < sources.n_children (); i++) {
unowned string? type = null, name = null;
sources.get_child (i, "(&s&s)", out type, out name);
Expand Down Expand Up @@ -121,13 +113,12 @@ public class Gala.KeyboardManager : Object {
var options = string.joinv (",", xkb_options);

#if HAS_MUTTER46
//TODO: add model support
display.get_context ().get_backend ().set_keymap (layout, variant, options, "");
backend.set_keymap (layout, variant, options, settings.get_string ("xkb-model"));
#else
display.get_context ().get_backend ().set_keymap (layout, variant, options);
backend.set_keymap (layout, variant, options);
#endif
} else if (key == "current") {
display.get_context ().get_backend ().lock_layout_group (settings.get_uint ("current"));
backend.lock_layout_group (settings.get_uint ("current"));
}
}
}