brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Handle extended keyboards through TERMINAL input purpose

Browse Source 
Drop the channeling of this specific signal from the InputMethod, and
update the OSK Keyboard object to using the purpose hint to find out
whether a extended keymap is necessary.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3162>
This commit is contained in:
Carlos Garnacho
2024-01-26 16:32:19 +01:00
parent 173d70dc70
commit 35bfb4501d
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/keyboard.js
View File

@ -1413,10 +1413,6 @@ export const Keyboard = GObject.registerClass({
this._updateKeys();
Main.inputMethod.connectObject(
'terminal-mode-changed', this._onTerminalModeChanged.bind(this),
this);
this._keyboardController.connectObject(
'active-group', this._onGroupChanged.bind(this),
'groups-changed', this._onKeyboardGroupsChanged.bind(this),
@ -1493,7 +1489,12 @@ export const Keyboard = GObject.registerClass({
}
_ensureKeys() {
const group = this._keyboardController.getCurrentGroup();
let group;
if (this._purpose === Clutter.InputContentPurpose.TERMINAL)
group = 'us-extended';
else
group = this._keyboardController.getCurrentGroup();
if (!this._groups[group])
this._groups[group] = this._createLayersForGroup(group);
}
@ -1617,7 +1618,7 @@ export const Keyboard = GObject.registerClass({
if (enabled &&
(!Main.inputMethod.currentFocus ||
Main.inputMethod.hasPreedit() ||
Main.inputMethod.terminalMode)) {
this._purpose === Clutter.InputContentPurpose.TERMINAL)) {
this._keyboardController.keyvalPress(Clutter.KEY_BackSpace);
this._backspacePressed = true;
return;
@ -1803,10 +1804,6 @@ export const Keyboard = GObject.registerClass({
this._updateKeys();
}
_onTerminalModeChanged() {
this._updateKeys();
}
_onKeyboardGroupsChanged() {
let nonGroupActors = [this._emojiSelection, this._keypad];
this._aspectContainer.get_children().filter(c => !nonGroupActors.includes(c)).forEach(c => {
@ -2220,9 +2217,6 @@ class KeyboardController extends Signals.EventEmitter {
}
getCurrentGroup() {
if (Main.inputMethod.terminalMode)
return 'us-extended';
// Special case for Korean, if Hangul mode is disabled, use the 'us' keymap
if (this._currentSource.id === 'hangul') {
const inputSourceManager = InputSourceManager.getInputSourceManager();