shellDBus: Add UngrabAccelerators
While it is possible to register accelerators in-bulk, there is no proper way to unregister them again. This adds the corresponding call for UngrabAccelerator to allow ungrabbing multiple accelerators at the same time. The idea is that g-s-d can use this in the future to simplify the keybinding reload logic. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/429
This commit is contained in:

committed by
Benjamin Berg

parent
60ccdc2deb
commit
561cecf383
@ -124,13 +124,20 @@ var GnomeShell = class {
|
||||
|
||||
UngrabAcceleratorAsync(params, invocation) {
|
||||
let [action] = params;
|
||||
let grabbedBy = this._grabbedAccelerators.get(action);
|
||||
if (invocation.get_sender() != grabbedBy)
|
||||
return invocation.return_value(GLib.Variant.new('(b)', [false]));
|
||||
let sender = invocation.get_sender();
|
||||
let ungrabSucceeded = this._ungrabAcceleratorForSender(action, sender);
|
||||
|
||||
return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
|
||||
}
|
||||
|
||||
UngrabAcceleratorsAsync(params, invocation) {
|
||||
let [actions] = params;
|
||||
let sender = invocation.get_sender();
|
||||
let ungrabSucceeded = true;
|
||||
|
||||
for (let i = 0; i < actions.length; i++)
|
||||
ungrabSucceeded &= this._ungrabAcceleratorForSender(actions[i], sender);
|
||||
|
||||
let ungrabSucceeded = global.display.ungrab_accelerator(action);
|
||||
if (ungrabSucceeded)
|
||||
this._grabbedAccelerators.delete(action);
|
||||
return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
|
||||
}
|
||||
|
||||
@ -174,6 +181,16 @@ var GnomeShell = class {
|
||||
let ungrabSucceeded = global.display.ungrab_accelerator(action);
|
||||
if (ungrabSucceeded)
|
||||
this._grabbedAccelerators.delete(action);
|
||||
|
||||
return ungrabSucceeded;
|
||||
}
|
||||
|
||||
_ungrabAcceleratorForSender(action, sender) {
|
||||
let grabbedBy = this._grabbedAccelerators.get(action);
|
||||
if (sender != grabbedBy)
|
||||
return false;
|
||||
|
||||
return this._ungrabAccelerator(action);
|
||||
}
|
||||
|
||||
_onGrabberBusNameVanished(connection, name) {
|
||||
|
Reference in New Issue
Block a user