Skip to content
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

Jump to bottom

KeyboardManager: get backend from context #1605

Merged
merged 1 commit into from Apr 1, 2023
Merged

KeyboardManager: get backend from context #1605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/KeyboardManager.vala
View file
Open in desktop
Expand Up @@ -9,12 +9,14 @@ public class Gala.KeyboardManager : Object {
private static VariantType sources_variant_type;
private static GLib.Settings settings;

public unowned Meta.Display display { construct; private get; }

public static void init (Meta.Display display) {
if (instance != null) {
return;
}

instance = new KeyboardManager ();
instance = new KeyboardManager (display);

display.modifiers_accelerator_activated.connect ((display) => KeyboardManager.handle_modifiers_accelerator_activated (display, false));
}
Expand All @@ -36,6 +38,10 @@ public class Gala.KeyboardManager : Object {
set_keyboard_layout (settings, "sources"); // Update layouts
}

private KeyboardManager (Meta.Display display) {
Object (display: display);
}

[CCode (instance_pos = -1)]
public static bool handle_modifiers_accelerator_activated (Meta.Display display, bool backward) {
display.ungrab_keyboard (display.get_current_time ());
Expand Down Expand Up @@ -89,9 +95,9 @@ public class Gala.KeyboardManager : Object {
var variant = string.joinv (",", variants);
var options = string.joinv (",", xkb_options);

Meta.Backend.get_backend ().set_keymap (layout, variant, options);
display.get_context ().get_backend ().set_keymap (layout, variant, options);
} else if (key == "current") {
Meta.Backend.get_backend ().lock_layout_group (settings.get_uint ("current"));
display.get_context ().get_backend ().lock_layout_group (settings.get_uint ("current"));
}
}
}