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

wayland/fractional: Avoid deadlock

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-06-15 12:43:52 +02:00
parent 8dbdd4a13e
commit cf5b4017ba
1 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/wayland/handlers/fractional_scale.rs
View file

@ -22,34 +22,35 @@ impl FractionalScaleHandler for State {
// If all the above tests do not lead to a output we just use the active output // If all the above tests do not lead to a output we just use the active output
// of the last active seat (which will also be the output a toplevel will // of the last active seat (which will also be the output a toplevel will
// initially be placed on) // initially be placed on)
let mut root = surface.clone(); let output = with_states(&surface, |states| {
while let Some(parent) = get_parent(&root) { surface_primary_scanout_output(&surface, states)
root = parent; })
} .or_else(|| {
let mut root = surface.clone();
while let Some(parent) = get_parent(&root) {
root = parent;
}
(root != surface)
.then(|| {
with_states(&root, |states| {
surface_primary_scanout_output(&root, states)
})
})
.flatten()
.or_else(|| {
self.common
.shell
.visible_outputs_for_surface(&surface)
.next()
})
})
.unwrap_or_else(|| {
let seat = self.common.last_active_seat();
seat.active_output()
});
with_states(&surface, |states| { with_states(&surface, |states| {
let output = surface_primary_scanout_output(&surface, states)
.or_else(|| {
if root != surface {
with_states(&root, |states| {
surface_primary_scanout_output(&root, states).or_else(|| {
self.common
.shell
.visible_outputs_for_surface(&surface)
.next()
})
})
} else {
self.common
.shell
.visible_outputs_for_surface(&surface)
.next()
}
})
.unwrap_or_else(|| {
let seat = self.common.last_active_seat();
seat.active_output()
});
with_fractional_scale(states, |fractional_scale| { with_fractional_scale(states, |fractional_scale| {
fractional_scale.set_preferred_scale(output.current_scale().fractional_scale()); fractional_scale.set_preferred_scale(output.current_scale().fractional_scale());
}); });