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

ScreenShield: try harder to become modal, and catch failures

Browse Source 
The screenshield was not checking the return value of pushModal(), meaning
that it believed it was fully locked when it was not. Later, calling
popModal() would fail, causing an exception and blocking the unlock.
Now when we fail we include an explanatory message, pointing the user
to the actual cause of the issue.

https://bugzilla.gnome.org/show_bug.cgi?id=689106
This commit is contained in:
Giovanni Campagna 2012-11-26 20:18:57 +01:00
parent 2b1a661614
commit 4dc9540325
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/ui/screenShield.js
View File

@ -568,6 +568,21 @@ const ScreenShield = new Lang.Class({
} }
}, },
_becomeModal: function() {
if (this._isModal)
return true;
this._isModal = Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
if (this._isModal)
return true;
// We failed to get a pointer grab, it means that
// something else has it. Try with a keyboard grab only
this._isModal = Main.pushModal(this.actor, { options: Meta.ModalOptions.POINTER_ALREADY_GRABBED,
keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN });
return this._isModal;
},
_onLockScreenKeyRelease: function(actor, event) { _onLockScreenKeyRelease: function(actor, event) {
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
@ -725,10 +740,18 @@ const ScreenShield = new Lang.Class({
} }
} }
if (!this._isModal) { if (!this._becomeModal()) {
Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN }); // We could not become modal, so we can't activate the
this._isModal = true; // screenshield. The user is probably very upset at this
} // point, but any application using global grabs is broken
// Just tell him to stop using this app
//
// XXX: another option is to kick the user into the gdm login
// screen, where we're not affected by grabs
Main.notifyError(_("Unable to lock"),
_("Lock was blocked by an application"));
return;
}
if (this._lightbox.actor.visible || if (this._lightbox.actor.visible ||
this._isActive) { this._isActive) {
@ -805,9 +828,10 @@ const ScreenShield = new Lang.Class({
// Ensure that the stage window is mapped, before taking a grab // Ensure that the stage window is mapped, before taking a grab
// otherwise X errors out // otherwise X errors out
Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
if (!this._isModal) { if (!this._becomeModal()) {
Main.pushModal(this.actor); // In the login screen, this is a hard error. Fail-whale
this._isModal = true; log('Could not acquire modal grab for the login screen. Aborting login process.');
Meta.quit(Meta.ExitCode.ERROR);
} }
return false; return false;
@ -1135,9 +1159,11 @@ const ScreenShield = new Lang.Class({
}, },
lock: function(animate) { lock: function(animate) {
if (!this._isModal) { // Warn the user if we can't become modal
Main.pushModal(this.actor, { keybindingMode: Shell.KeyBindingMode.LOCK_SCREEN }); if (!this._becomeModal()) {
this._isModal = true; Main.notifyError(_("Unable to lock"),
_("Lock was blocked by an application"));
return;
} }
this._isLocked = true; this._isLocked = true;