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

output-management: Handle destroy requests better

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-05-06 18:02:19 +02:00 • committed by Victoria Brekenfeld
parent 45bdffe802
commit 954aa6edeb
3 changed files with 71 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/wayland/protocols/output_configuration/handlers/cosmic.rs
View file

@ -35,16 +35,14 @@ where
+ 'static,
{
fn bind(
state: &mut D,
_state: &mut D,
_dh: &DisplayHandle,
_client: &Client,
resource: New<ZcosmicOutputManagerV1>,
_global_data: &OutputMngrGlobalData,
data_init: &mut DataInit<'_, D>,
) {
let obj = data_init.init(resource, ());
let mngr_state = state.output_configuration_state();
mngr_state.extension_instances.push(obj);
data_init.init(resource, ());
}
fn can_view(client: Client, global_data: &OutputMngrGlobalData) -> bool {
@ -55,7 +53,7 @@ where
impl<D> Dispatch<ZcosmicOutputManagerV1, (), D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -110,9 +108,36 @@ where
extended,
config_head,
} => {
if let Some(pending) = config_head.data::<PendingOutputConfiguration>() {
let obj = data_init.init(extended, config_head.downgrade());
pending.lock().unwrap().extension_obj = Some(obj);
data_init.init(extended, config_head.downgrade());
}
_ => {}
}
}
}
impl<D> Dispatch<ZcosmicOutputHeadV1, Weak<ZwlrOutputHeadV1>, D> for OutputConfigurationState<D>
where
D: OutputConfigurationHandler + 'static,
{
fn request(
state: &mut D,
_client: &Client,
obj: &ZcosmicOutputHeadV1,
request: zcosmic_output_head_v1::Request,
_data: &Weak<ZwlrOutputHeadV1>,
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
match request {
zcosmic_output_head_v1::Request::Release => {
let inner = state.output_configuration_state();
if let Some(head) = inner
.instances
.iter_mut()
.flat_map(|instance| instance.heads.iter_mut())
.find(|head| head.extension_obj.as_ref().is_some_and(|o| o == obj))
{
head.extension_obj.take();
}
}
_ => {}
@ -120,24 +145,11 @@ where
}
}
impl<D> Dispatch<ZcosmicOutputHeadV1, Weak<ZwlrOutputHeadV1>, D> for OutputConfigurationState<D> {
fn request(
_state: &mut D,
_client: &Client,
_obj: &ZcosmicOutputHeadV1,
_request: zcosmic_output_head_v1::Request,
_data: &Weak<ZwlrOutputHeadV1>,
_dh: &DisplayHandle,
_data_init: &mut DataInit<'_, D>,
) {
}
}
impl<D> Dispatch<ZcosmicOutputConfigurationV1, Weak<ZwlrOutputConfigurationV1>, D>
for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -209,22 +221,10 @@ where
}
}
}
zcosmic_output_configuration_v1::Request::Destroy => {
zcosmic_output_configuration_v1::Request::Release => {
if let Ok(obj) = obj.upgrade() {
if let Some(data) = obj.data::<PendingConfiguration>() {
let mut pending = data.lock().unwrap();
let _ = pending.extension_obj.take();
pending.heads.retain(|(_, conf)| match conf {
Some(head) => {
if let Some(data) = head.data::<PendingOutputConfiguration>() {
let output_conf = data.lock().unwrap();
output_conf.mirroring.is_none()
} else {
true
}
}
None => true,
})
data.lock().unwrap().extension_obj.take();
}
}
}
@ -237,7 +237,7 @@ impl<D> Dispatch<ZcosmicOutputConfigurationHeadV1, Weak<ZwlrOutputConfigurationH
for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>

66
src/wayland/protocols/output_configuration/handlers/wlr.rs
View file

@ -18,20 +18,14 @@ use smithay::{
},
utils::{Point, Size},
};
use std::{
convert::TryInto,
sync::{
atomic::{AtomicBool, Ordering},
Arc,
},
};
use std::convert::TryInto;
use crate::wayland::protocols::output_configuration::*;
impl<D> GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData, D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -47,15 +41,9 @@ where
_global_data: &OutputMngrGlobalData,
data_init: &mut DataInit<'_, D>,
) {
let active = Arc::new(AtomicBool::new(true));
let data = OutputMngrInstanceData {
active: active.clone(),
};
let mut instance = OutputMngrInstance {
obj: data_init.init(resource, data),
obj: data_init.init(resource, ()),
heads: Vec::new(),
active,
stale_modes: Vec::new(),
};
let mngr_state = state.output_configuration_state();
@ -71,10 +59,10 @@ where
}
}
impl<D> Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData, D> for OutputConfigurationState<D>
impl<D> Dispatch<ZwlrOutputManagerV1, (), D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -85,9 +73,9 @@ where
fn request(
state: &mut D,
_client: &Client,
_obj: &ZwlrOutputManagerV1,
obj: &ZwlrOutputManagerV1,
request: zwlr_output_manager_v1::Request,
data: &OutputMngrInstanceData,
_data: &(),
_dh: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
@ -109,17 +97,29 @@ where
}
}
zwlr_output_manager_v1::Request::Stop => {
data.active.store(false, Ordering::SeqCst);
let state = state.output_configuration_state();
state.instances.retain(|instance| instance.obj != *obj);
obj.finished();
}
_ => {}
}
}
fn destroyed(
state: &mut D,
_client: wayland_backend::server::ClientId,
obj: &ZwlrOutputManagerV1,
_data: &(),
) {
let state = state.output_configuration_state();
state.instances.retain(|instance| instance.obj != *obj);
}
}
impl<D> Dispatch<ZwlrOutputHeadV1, Output, D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -156,7 +156,7 @@ where
impl<D> Dispatch<ZwlrOutputModeV1, Mode, D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -175,30 +175,22 @@ where
) {
match request {
zwlr_output_mode_v1::Request::Release => {
for instance in &mut state.output_configuration_state().instances {
instance.stale_modes.retain(|mode| mode != obj)
let state = state.output_configuration_state();
for instance in &mut state.instances {
for head in &mut instance.heads {
head.modes.retain(|mode| mode != obj)
}
}
}
_ => {}
}
}
fn destroyed(
state: &mut D,
_client: wayland_backend::server::ClientId,
obj: &ZwlrOutputModeV1,
_data: &Mode,
) {
for instance in &mut state.output_configuration_state().instances {
instance.stale_modes.retain(|mode| mode != obj)
}
}
}
impl<D> Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration, D> for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -389,7 +381,7 @@ impl<D> Dispatch<ZwlrOutputConfigurationHeadV1, PendingOutputConfiguration, D>
for OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>

35
src/wayland/protocols/output_configuration/mod.rs
View file

@ -13,7 +13,7 @@ use smithay::{
zwlr_output_configuration_v1::ZwlrOutputConfigurationV1,
zwlr_output_head_v1::{self, ZwlrOutputHeadV1},
zwlr_output_manager_v1::ZwlrOutputManagerV1,
zwlr_output_mode_v1::{self, ZwlrOutputModeV1},
zwlr_output_mode_v1::ZwlrOutputModeV1,
},
wayland_server::{
backend::GlobalId, protocol::wl_output::WlOutput, Client, Dispatch, DisplayHandle,
@ -23,13 +23,7 @@ use smithay::{
utils::{Logical, Physical, Point, Size, Transform},
wayland::output::WlOutputData,
};
use std::{
convert::TryFrom,
sync::{
atomic::{AtomicBool, Ordering},
Arc, Mutex,
},
};
use std::{convert::TryFrom, sync::Mutex};
mod handlers;
@ -38,7 +32,6 @@ pub struct OutputConfigurationState<D> {
outputs: Vec<Output>,
removed_outputs: Vec<Output>,
instances: Vec<OutputMngrInstance>,
extension_instances: Vec<ZcosmicOutputManagerV1>,
serial_counter: u32,
global: GlobalId,
extension_global: GlobalId,
@ -60,9 +53,7 @@ pub struct OutputMngrGlobalData {
#[derive(Debug)]
struct OutputMngrInstance {
obj: ZwlrOutputManagerV1,
active: Arc<AtomicBool>,
heads: Vec<OutputHeadInstance>,
stale_modes: Vec<ZwlrOutputModeV1>,
}
#[derive(Debug)]
@ -74,10 +65,6 @@ struct OutputHeadInstance {
finished: bool,
}
pub struct OutputMngrInstanceData {
active: Arc<AtomicBool>,
}
#[derive(Debug, Default)]
pub struct PendingConfigurationInner {
extension_obj: Option<ZcosmicOutputConfigurationV1>,
@ -99,7 +86,6 @@ pub enum ModeConfiguration<M: Clone> {
#[derive(Debug, Default, Clone)]
pub struct PendingOutputConfigurationInner {
extension_obj: Option<ZcosmicOutputConfigurationHeadV1>,
mirroring: Option<Output>,
mode: Option<ModeConfiguration<ZwlrOutputModeV1>>,
position: Option<Point<i32, Logical>>,
@ -160,7 +146,7 @@ impl<D> OutputConfigurationState<D>
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ GlobalDispatch<WlOutput, WlOutputData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -195,7 +181,6 @@ where
outputs: Vec::new(),
removed_outputs: Vec::new(),
instances: Vec::new(),
extension_instances: Vec::new(),
serial_counter: 0,
global,
extension_global,
@ -260,7 +245,6 @@ where
}
pub fn update(&mut self) {
self.instances.retain(|x| x.active.load(Ordering::SeqCst));
self.serial_counter += 1;
for output in std::mem::take(&mut self.removed_outputs).into_iter() {
@ -273,11 +257,6 @@ where
}
for mode in &mut head.modes {
mode.finished();
if mode.version() < zwlr_output_mode_v1::REQ_RELEASE_SINCE {
// on >=v3 we keep the obj around until we get a release-request
// otherwise we will drop this with the head
instance.stale_modes.push(mode.clone());
}
}
head.obj.finished();
head.finished = true;
@ -316,7 +295,7 @@ where
fn send_head_to_client<D>(dh: &DisplayHandle, mngr: &mut OutputMngrInstance, output: &Output)
where
D: GlobalDispatch<ZwlrOutputManagerV1, OutputMngrGlobalData>
+ Dispatch<ZwlrOutputManagerV1, OutputMngrInstanceData>
+ Dispatch<ZwlrOutputManagerV1, ()>
+ Dispatch<ZwlrOutputHeadV1, Output>
+ Dispatch<ZwlrOutputModeV1, Mode>
+ Dispatch<ZwlrOutputConfigurationV1, PendingConfiguration>
@ -375,10 +354,6 @@ where
instance.modes.retain_mut(|m| {
if !output_modes.contains(m.data::<Mode>().unwrap()) {
m.finished();
if m.version() < zwlr_output_mode_v1::REQ_RELEASE_SINCE {
// on >=v3 we keep the obj around until we get a release-request
mngr.stale_modes.push(m.clone());
}
false
} else {
true
@ -474,7 +449,7 @@ macro_rules! delegate_output_configuration {
smithay::reexports::wayland_protocols_wlr::output_management::v1::server::zwlr_output_manager_v1::ZwlrOutputManagerV1: $crate::wayland::protocols::output_configuration::OutputMngrGlobalData
] => $crate::wayland::protocols::output_configuration::OutputConfigurationState<Self>);
smithay::reexports::wayland_server::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
smithay::reexports::wayland_protocols_wlr::output_management::v1::server::zwlr_output_manager_v1::ZwlrOutputManagerV1: $crate::wayland::protocols::output_configuration::OutputMngrInstanceData
smithay::reexports::wayland_protocols_wlr::output_management::v1::server::zwlr_output_manager_v1::ZwlrOutputManagerV1: ()
] => $crate::wayland::protocols::output_configuration::OutputConfigurationState<Self>);
smithay::reexports::wayland_server::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
smithay::reexports::wayland_protocols_wlr::output_management::v1::server::zwlr_output_head_v1::ZwlrOutputHeadV1: smithay::output::Output