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

kms: Don't reload outputs for every single event

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-08-11 16:50:45 +02:00 • committed by Victoria Brekenfeld
parent 6897f81984
commit cb2289e7b1
3 changed files with 34 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/backend/kms/device.rs
View file

@ -370,20 +370,8 @@ impl State {
self.common
.output_configuration_state
.add_heads(wl_outputs.iter());
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&self.common.shell,
&self.common.event_loop_handle,
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
self.backend.kms().refresh_used_devices()?;
self.common.refresh();
Ok(())
}
@ -469,28 +457,12 @@ impl State {
self.common
.output_configuration_state
.add_heads(outputs_added.iter());
{
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&self.common.shell,
&self.common.event_loop_handle,
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
// Don't remove the outputs, before potentially new ones have been initialized.
// reading a new config means outputs might become enabled, that were previously disabled.
// This gives the shell more information on how to move outputs.
for output in outputs_removed {
self.common.remove_output(&output);
}
self.common.refresh();
for output in outputs_removed {
self.common.remove_output(&output);
}
self.backend.kms().refresh_used_devices()?;
Ok(())
}
@ -533,29 +505,32 @@ impl State {
self.common
.output_configuration_state
.remove_heads(outputs_removed.iter());
backend.refresh_used_devices()?;
if backend.session.is_active() {
for output in outputs_removed {
self.common.remove_output(&output);
}
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&self.common.shell,
&self.common.event_loop_handle,
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
self.common.refresh();
} else {
self.common.output_configuration_state.update();
}
backend.refresh_used_devices()?;
Ok(())
}
pub fn refresh_output_config(&mut self) {
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&self.common.shell,
&self.common.event_loop_handle,
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
self.common.refresh();
}
}
pub struct OutputChanges {