leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Fix deadlock holding shell during grab code

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-06-07 20:06:00 +02:00 • committed by Victoria Brekenfeld
parent 469a366207
commit 0c11c0f959
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/input/mod.rs
View file

@ -213,6 +213,8 @@ impl State {
let pointer = seat.get_pointer().unwrap(); let pointer = seat.get_pointer().unwrap();
let is_grabbed = keyboard.is_grabbed() || pointer.is_grabbed(); let is_grabbed = keyboard.is_grabbed() || pointer.is_grabbed();
let current_focus = keyboard.current_focus(); let current_focus = keyboard.current_focus();
let shell_ref = self.common.shell.clone();
let mut shell = shell_ref.write().unwrap();
if let Some((action, pattern)) = keyboard if let Some((action, pattern)) = keyboard
.input( .input(
self, self,
@ -222,7 +224,6 @@ impl State {
time, time,
|data, modifiers, handle| { |data, modifiers, handle| {
// Leave move overview mode, if any modifier was released // Leave move overview mode, if any modifier was released
let mut shell = data.common.shell.write().unwrap();
if let OverviewMode::Started(Trigger::KeyboardMove(action_modifiers), _) = if let OverviewMode::Started(Trigger::KeyboardMove(action_modifiers), _) =
shell.overview_mode().0 shell.overview_mode().0
{ {
@ -466,6 +467,7 @@ impl State {
} }
// keys are passed through to apps // keys are passed through to apps
std::mem::drop(shell);
FilterResult::Forward FilterResult::Forward
}, },
) )