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

seat: Workaround old active outputs on hotplug

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-22 10:07:17 +01:00
parent 9c41c80345
commit b2686424ea
9 changed files with 69 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/backend/kms/mod.rs
View file

@ -33,6 +33,7 @@ use smithay::{
udev::{all_gpus, primary_gpu, UdevBackend, UdevEvent},
},
desktop::utils::OutputPresentationFeedback,
input::Seat,
output::{Mode as OutputMode, Output, PhysicalProperties, Subpixel},
reexports::{
calloop::{
@ -255,10 +256,12 @@ pub fn init_backend(
}
}
let seats = data.state.common.seats().cloned().collect::<Vec<_>>();
data.state.common.config.read_outputs(
&mut data.state.common.output_configuration_state,
&mut data.state.backend,
&mut data.state.common.shell,
seats.into_iter(),
&data.state.common.event_loop_handle,
);
for surface in data
@ -534,10 +537,12 @@ impl State {
self.common
.output_configuration_state
.add_heads(wl_outputs.iter());
let seats = self.common.seats().cloned().collect::<Vec<_>>();
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&mut self.common.shell,
seats.into_iter(),
&self.common.event_loop_handle,
);
@ -600,13 +605,17 @@ impl State {
self.common
.output_configuration_state
.add_heads(outputs_added.iter());
let seats = self.common.seats().cloned().collect::<Vec<_>>();
for output in outputs_removed {
self.common.shell.remove_output(&output);
self.common
.shell
.remove_output(&output, seats.iter().cloned());
}
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&mut self.common.shell,
seats.into_iter(),
&self.common.event_loop_handle,
);
@ -638,14 +647,18 @@ impl State {
.output_configuration_state
.remove_heads(outputs_removed.iter());
let seats = self.common.seats().cloned().collect::<Vec<_>>();
if self.backend.kms().session.is_active() {
for output in outputs_removed {
self.common.shell.remove_output(&output);
self.common
.shell
.remove_output(&output, seats.iter().cloned());
}
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&mut self.common.shell,
seats.into_iter(),
&self.common.event_loop_handle,
);
} else {
@ -880,6 +893,7 @@ impl KmsState {
pub fn apply_config_for_output(
&mut self,
output: &Output,
seats: impl Iterator<Item = Seat<State>>,
shell: &mut Shell,
test_only: bool,
loop_handle: &LoopHandle<'_, Data>,
@ -902,7 +916,7 @@ impl KmsState {
if !output_config.enabled {
if !test_only {
shell.remove_output(output);
shell.remove_output(output, seats);
if surface.surface.take().is_some() {
// just drop it
surface.pending = false;

8
src/backend/winit.rs
View file

@ -211,7 +211,11 @@ pub fn init_backend(
}
Err(winit::WinitError::WindowClosed) => {
let output = data.state.backend.winit().output.clone();
data.state.common.shell.remove_output(&output);
let seats = data.state.common.seats().cloned().collect::<Vec<_>>();
data.state
.common
.shell
.remove_output(&output, seats.into_iter());
if let Some(token) = token.take() {
event_loop_handle.remove(token);
}
@ -237,10 +241,12 @@ pub fn init_backend(
.output_configuration_state
.add_heads(std::iter::once(&output));
state.common.shell.add_output(&output);
let seats = state.common.seats().cloned().collect::<Vec<_>>();
state.common.config.read_outputs(
&mut state.common.output_configuration_state,
&mut state.backend,
&mut state.common.shell,
seats.iter().cloned(),
&state.common.event_loop_handle,
);

9
src/backend/x11.rs
View file

@ -296,16 +296,18 @@ pub fn init_backend(
.output_configuration_state
.add_heads(std::iter::once(&output));
state.common.shell.add_output(&output);
let seats = state.common.seats().cloned().collect::<Vec<_>>();
state.common.config.read_outputs(
&mut state.common.output_configuration_state,
&mut state.backend,
&mut state.common.shell,
seats.iter().cloned(),
&state.common.event_loop_handle,
);
event_loop
.handle()
.insert_source(backend, |event, _, data| match event {
.insert_source(backend, move |event, _, data| match event {
X11Event::CloseRequested { window_id } => {
// TODO: drain_filter
let mut outputs_removed = Vec::new();
@ -326,7 +328,10 @@ pub fn init_backend(
.surfaces
.retain(|s| s.window.id() != window_id);
for output in outputs_removed.into_iter() {
data.state.common.shell.remove_output(&output);
data.state
.common
.shell
.remove_output(&output, seats.iter().cloned());
}
}
X11Event::Resized {

23
src/config/mod.rs
View file

@ -6,6 +6,7 @@ use crate::{
wayland::protocols::output_configuration::OutputConfigurationState,
};
use serde::{Deserialize, Serialize};
use smithay::input::Seat;
pub use smithay::{
backend::input::KeyState,
input::keyboard::{keysyms as KeySyms, Keysym, ModifiersState},
@ -282,8 +283,10 @@ impl Config {
output_state: &mut OutputConfigurationState<State>,
backend: &mut BackendData,
shell: &mut Shell,
seats: impl Iterator<Item = Seat<State>>,
loop_handle: &LoopHandle<'_, Data>,
) {
let seats = seats.collect::<Vec<_>>();
let outputs = output_state.outputs().collect::<Vec<_>>();
let mut infos = outputs
.iter()
@ -314,9 +317,13 @@ impl Config {
.get::<RefCell<OutputConfig>>()
.unwrap()
.borrow_mut() = output_config;
if let Err(err) =
backend.apply_config_for_output(&output, false, shell, loop_handle)
{
if let Err(err) = backend.apply_config_for_output(
&output,
false,
shell,
seats.iter().cloned(),
loop_handle,
) {
slog_scope::warn!(
"Failed to set new config for output {}: {}",
output.name(),
@ -345,9 +352,13 @@ impl Config {
.get::<RefCell<OutputConfig>>()
.unwrap()
.borrow_mut() = output_config;
if let Err(err) =
backend.apply_config_for_output(&output, false, shell, loop_handle)
{
if let Err(err) = backend.apply_config_for_output(
&output,
false,
shell,
seats.iter().cloned(),
loop_handle,
) {
slog_scope::error!(
"Failed to reset config for output {}: {}",
output.name(),

4
src/shell/focus/mod.rs
View file

@ -167,6 +167,10 @@ impl Common {
let seats = state.common.seats().cloned().collect::<Vec<_>>();
for seat in seats {
let output = seat.active_output();
if !state.common.shell.outputs.contains(&output) {
seat.set_active_output(&state.common.shell.outputs[0]);
continue;
}
let last_known_focus = ActiveFocus::get(&seat);
if let Some(target) = last_known_focus {

10
src/shell/mod.rs
View file

@ -448,7 +448,15 @@ impl Shell {
}
}
pub fn remove_output(&mut self, output: &Output) {
pub fn remove_output(&mut self, output: &Output, seats: impl Iterator<Item = Seat<State>>) {
if let Some(first_output) = self.outputs.get(0) {
for seat in seats {
if &seat.active_output() == output {
seat.set_active_output(first_output);
}
}
}
if !self.outputs.contains(output) {
return;
}

3
src/state.rs
View file

@ -141,11 +141,12 @@ impl BackendData {
output: &Output,
test_only: bool,
shell: &mut Shell,
seats: impl Iterator<Item = Seat<State>>,
loop_handle: &LoopHandle<'_, Data>,
) -> Result<(), anyhow::Error> {
let result = match self {
BackendData::Kms(ref mut state) => {
state.apply_config_for_output(output, shell, test_only, loop_handle)
state.apply_config_for_output(output, seats, shell, test_only, loop_handle)
}
BackendData::Winit(ref mut state) => state.apply_config_for_output(output, test_only),
BackendData::X11(ref mut state) => state.apply_config_for_output(output, test_only),

3
src/wayland/handlers/output_configuration.rs
View file

@ -81,10 +81,12 @@ impl State {
}
}
let seats = self.common.seats().cloned().collect::<Vec<_>>();
if let Err(err) = self.backend.apply_config_for_output(
output,
test_only,
&mut self.common.shell,
seats.iter().cloned(),
&self.common.event_loop_handle,
) {
slog_scope::warn!(
@ -106,6 +108,7 @@ impl State {
output,
false,
&mut self.common.shell,
seats.iter().cloned(),
&self.common.event_loop_handle,
) {
slog_scope::error!(

3
src/wayland/handlers/screencopy.rs
View file

@ -1018,6 +1018,9 @@ impl State {
if !session.alive() {
return;
}
if !data.state.common.shell.outputs.contains(&output) {
return;
}
match render_workspace_to_buffer(
&mut data.state,
&session,