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

keyboard: Listen to IbusPanelService::focus-in/out to track focus changes

Browse Source 
In X11 there's no input panel state requests, so restore the previous behavior
that focused entries would always toggle the OSK on there.
This commit is contained in:
Carlos Garnacho 2018-09-18 12:54:29 +02:00 committed by Florian Müllner
parent 7ea034c719
commit 11fb91f60f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/misc/ibusManager.js
View File

@ -119,6 +119,11 @@ var IBusManager = new Lang.Class({
let cursorLocation = { x, y, width: w, height: h };
this.emit('set-cursor-location', cursorLocation);
});
this._panelService.connect('focus-in', (panel, path) => {
if (!GLib.str_has_suffix(path, '/InputContext_1'))
this.emit ('focus-in');
});
this._panelService.connect('focus-out', () => { this.emit('focus-out'); });
try {
// IBus versions older than 1.5.10 have a bug which

16
js/ui/keyboard.js
View File

@ -519,6 +519,12 @@ var FocusTracker = new Lang.Class({
this._setCurrentRect(rect);
});
this._ibusManager.connect('focus-in', () => {
this.emit('focus-changed', true);
});
this._ibusManager.connect('focus-out', () => {
this.emit('focus-changed', false);
});
},
get currentWindow() {
@ -590,6 +596,16 @@ var Keyboard = new Lang.Class({
this._animFocusedWindow = null;
this._oskFocusWindow = null;
});
this._focusTracker.connect('focus-changed', (tracker, focused) => {
// Valid only for X11
if (Meta.is_wayland_compositor())
return;
if (focused)
this.show(Main.layoutManager.focusIndex);
else
this.hide();
});
Meta.get_backend().connect('last-device-changed',
(backend, deviceId) => {