Skip to content

Fail gracefully instead of crashing if grab fails with the error "Could not grab modal" #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
icyflame wants to merge 1 commit into
base: develop
Choose a base branch
from
+27 −4
Open

Fail gracefully instead of crashing if grab fails with the error "Could not grab modal" #1031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions navigator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,21 @@ class ActionDispatcher {

// grab = stage.grab(this.actor)
grab = Main.pushModal(this.actor);
// Assume that grab succeeds and store that state in the object
this.success = true;
// We expect at least a keyboard grab here
if ((grab.get_seat_state() & Clutter.GrabState.KEYBOARD) === 0) {
console.error("Failed to grab modal");
throw new Error('Could not grab modal');
// Release current grab and let the user try again
try {
this.success = false;
if (grab) {
Main.popModal(grab);
grab = null;
}
} catch (e) {
console.error("Failed to release grab");
}
}

this.signals.connect(this.actor, 'key-press-event', this._keyPressEvent.bind(this));
Expand Down Expand Up @@ -117,6 +128,9 @@ class ActionDispatcher {
}

show(_backward, binding, mask) {
// If required grab was not successful, then do not show anything
if (!this.success) return;

this._modifierMask = primaryModifier(mask);
this.navigator = getNavigator();
Topbar.fixTopBar();
Expand Down Expand Up @@ -519,11 +533,11 @@ export function getActionDispatcher(mode) {
return dispatcher;
}
dispatcher = new ActionDispatcher();
return getActionDispatcher(mode);
return getActionDispatcher(mode);
}

/**
* Fishes current dispatcher (if any).
* Finishes current dispatcher (if any).
*/
export function finishDispatching() {
dispatcher?._finish(global.get_current_time());
Expand All @@ -546,5 +560,14 @@ export function dismissDispatcher(mode) {

export function preview_navigate(meta_window, space, { _display, _screen, binding }) {
let tabPopup = getActionDispatcher(Clutter.GrabState.KEYBOARD);
tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask());

// Getting a dispatcher does not always succeed. Sometimes, it can fail because we are unable to
// grab the keyboard.
// In the case of a failure, fail gracefully by destroying the pop-up.
if (!tabPopup.success) {
tabPopup.destroy();
return;
}

tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask());
}