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

shell: refactor single visible_output

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-12-20 19:58:43 +00:00 • committed by Victoria Brekenfeld
parent 414cbfef2d
commit d503e44ca8
5 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/wayland/handlers/compositor.rs
View file

@ -36,7 +36,7 @@ impl State {
fn early_import_surface(&mut self, surface: &WlSurface) {
let mut import_nodes = std::collections::HashSet::new();
let dh = &self.common.display_handle;
for output in self.common.shell.visible_outputs_for_surface(&surface) {
if let Some(output) = self.common.shell.visible_output_for_surface(&surface) {
if let BackendData::Kms(ref mut kms_state) = &mut self.backend {
if let Some(target) = kms_state.target_node_for_output(&output) {
if import_nodes.insert(target) {
@ -261,7 +261,7 @@ impl CompositorHandler for State {
let mut scheduled_sessions = self.schedule_workspace_sessions(surface);
// schedule a new render
for output in self.common.shell.visible_outputs_for_surface(surface) {
if let Some(output) = self.common.shell.visible_output_for_surface(surface) {
if let Some(sessions) = output.user_data().get::<PendingScreencopyBuffers>() {
scheduled_sessions
.get_or_insert_with(Vec::new)
@ -276,7 +276,7 @@ impl CompositorHandler for State {
.iter()
.filter(|(s, _)| match s.session_type() {
SessionType::Output(o) | SessionType::Workspace(o, _)
if o == output =>
if &o == output =>
{
true
}

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

@ -41,8 +41,8 @@ impl FractionalScaleHandler for State {
.or_else(|| {
self.common
.shell
.visible_outputs_for_surface(&surface)
.next()
.visible_output_for_surface(&surface)
.cloned()
})
})
.unwrap_or_else(|| {

12
src/wayland/handlers/xdg_shell/mod.rs
View file

@ -315,12 +315,12 @@ impl XdgShellHandler for State {
}
fn toplevel_destroyed(&mut self, surface: ToplevelSurface) {
let outputs = self
let output = self
.common
.shell
.visible_outputs_for_surface(surface.wl_surface())
.collect::<Vec<_>>();
for output in outputs.iter() {
.visible_output_for_surface(surface.wl_surface())
.cloned();
if let Some(output) = output.as_ref() {
self.common.shell.refresh_active_space(output);
}
@ -335,7 +335,7 @@ impl XdgShellHandler for State {
// screencopy
let mut scheduled_sessions = self.schedule_workspace_sessions(surface.wl_surface());
for output in outputs.into_iter() {
if let Some(output) = output.as_ref() {
if let Some(sessions) = output.user_data().get::<PendingScreencopyBuffers>() {
scheduled_sessions
.get_or_insert_with(Vec::new)
@ -349,7 +349,7 @@ impl XdgShellHandler for State {
.iter()
.filter(|(s, _)| match s.session_type() {
SessionType::Output(o) | SessionType::Workspace(o, _)
if o == output =>
if &o == output =>
{
true
}