126 lines
4.4 KiB
Diff
126 lines
4.4 KiB
Diff
From 42355d8e9fc41b011a69e739ba536871483d41c6 Mon Sep 17 00:00:00 2001
|
|
From: Ray Strode <rstrode@redhat.com>
|
|
Date: Wed, 16 Aug 2023 14:09:50 -0400
|
|
Subject: [PATCH 3/3] status/keyboard: Use gnome-desktop API for getting
|
|
default input sources list
|
|
|
|
At the moment, gnome-shell tries to figure out the default input sources
|
|
from localed. It fails to take into account the system locale and input
|
|
methods.
|
|
|
|
This commit switches it to use a new function in gnome-desktop,
|
|
gnome_get_default_input_sources, which does most of the heavy
|
|
lifting itself, instead.
|
|
---
|
|
js/ui/status/keyboard.js | 56 ++++++++++++++++++----------------------
|
|
1 file changed, 25 insertions(+), 31 deletions(-)
|
|
|
|
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
|
index 97e35d482c..8a2f1d2f7d 100644
|
|
--- a/js/ui/status/keyboard.js
|
|
+++ b/js/ui/status/keyboard.js
|
|
@@ -3,6 +3,7 @@
|
|
import Clutter from 'gi://Clutter';
|
|
import Gio from 'gi://Gio';
|
|
import GLib from 'gi://GLib';
|
|
+import GnomeDesktop from 'gi://GnomeDesktop';
|
|
import GObject from 'gi://GObject';
|
|
import IBus from 'gi://IBus';
|
|
import Meta from 'gi://Meta';
|
|
@@ -25,6 +26,8 @@ export const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
|
const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
|
const KEY_INPUT_SOURCES = 'sources';
|
|
|
|
+Gio._promisify(GnomeDesktop, 'get_default_input_sources');
|
|
+
|
|
export const LayoutMenuItem = GObject.registerClass(
|
|
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
|
_init(displayName, shortName) {
|
|
@@ -197,9 +200,9 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
|
this._BUS_IFACE = 'org.freedesktop.locale1';
|
|
this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties';
|
|
|
|
- this._layouts = '';
|
|
- this._variants = '';
|
|
- this._options = '';
|
|
+ this._inputSourceIds = [];
|
|
+ this._inputSourceTypes = [];
|
|
+ this._options = [];
|
|
|
|
this._reload().catch(error => {
|
|
logError(error, 'Could not reload system input settings');
|
|
@@ -215,29 +218,20 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
|
}
|
|
|
|
async _reload() {
|
|
- let props;
|
|
+ let inputSourceIds;
|
|
+ let inputSourceTypes;
|
|
+ let options;
|
|
try {
|
|
- const result = await Gio.DBus.system.call(
|
|
- this._BUS_NAME,
|
|
- this._BUS_PATH,
|
|
- this._BUS_PROPS_IFACE,
|
|
- 'GetAll',
|
|
- new GLib.Variant('(s)', [this._BUS_IFACE]),
|
|
- null, Gio.DBusCallFlags.NONE, -1, null);
|
|
- [props] = result.deepUnpack();
|
|
+ [inputSourceIds, inputSourceTypes, options] = await GnomeDesktop.get_default_input_sources (null);
|
|
} catch (e) {
|
|
- log(`Could not get properties from ${this._BUS_NAME}`);
|
|
+ logError(e, 'Could not get default input sources');
|
|
return;
|
|
}
|
|
|
|
- const layouts = props['X11Layout'].unpack();
|
|
- const variants = props['X11Variant'].unpack();
|
|
- const options = props['X11Options'].unpack();
|
|
-
|
|
- if (layouts !== this._layouts ||
|
|
- variants !== this._variants) {
|
|
- this._layouts = layouts;
|
|
- this._variants = variants;
|
|
+ if (inputSourceIds !== this._inputSourceIds ||
|
|
+ inputSourceTypes !== this._inputSourceTypes) {
|
|
+ this._inputSourceIds = inputSourceIds;
|
|
+ this._inputSourceTypes = inputSourceTypes;
|
|
this._emitInputSourcesChanged();
|
|
}
|
|
if (options !== this._options) {
|
|
@@ -247,21 +241,21 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
|
}
|
|
|
|
get inputSources() {
|
|
- let sourcesList = [];
|
|
- let layouts = this._layouts.split(',');
|
|
- let variants = this._variants.split(',');
|
|
-
|
|
- for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
|
|
- let id = layouts[i];
|
|
- if (variants[i])
|
|
- id += `+${variants[i]}`;
|
|
- sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id});
|
|
+ let sourcesList;
|
|
+
|
|
+ if (this._inputSourceIds) {
|
|
+ sourcesList = this._inputSourceIds.map((id, index) => {
|
|
+ return { type: this._inputSourceTypes[index], id };
|
|
+ });
|
|
+ } else {
|
|
+ sourcesList = [];
|
|
}
|
|
+
|
|
return sourcesList;
|
|
}
|
|
|
|
get keyboardOptions() {
|
|
- return this._options.split(',');
|
|
+ return this._options;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.43.0
|
|
|