head-management: add compositor-space-transformer-v1 extension
This commit is contained in:
parent
a8ed4785af
commit
5636f6bda5
7 changed files with 99 additions and 0 deletions
|
|
@ -103,6 +103,7 @@ impl HeadState {
|
||||||
|
|
||||||
enum HeadOp {
|
enum HeadOp {
|
||||||
SetPosition(i32, i32),
|
SetPosition(i32, i32),
|
||||||
|
SetTransform(Transform),
|
||||||
SetScale(Scale),
|
SetScale(Scale),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -391,5 +391,6 @@ declare_extensions! {
|
||||||
core_info_v1: CoreInfoV1,
|
core_info_v1: CoreInfoV1,
|
||||||
compositor_space_info_v1: CompositorSpaceInfoV1,
|
compositor_space_info_v1: CompositorSpaceInfoV1,
|
||||||
compositor_space_positioner_v1: CompositorSpacePositionerV1,
|
compositor_space_positioner_v1: CompositorSpacePositionerV1,
|
||||||
|
compositor_space_transformer_v1: CompositorSpaceTransformerV1,
|
||||||
compositor_space_scaler_v1: CompositorSpaceScalerV1,
|
compositor_space_scaler_v1: CompositorSpaceScalerV1,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
pub(super) mod jay_head_ext_compositor_space_info_v1;
|
pub(super) mod jay_head_ext_compositor_space_info_v1;
|
||||||
pub(super) mod jay_head_ext_compositor_space_positioner_v1;
|
pub(super) mod jay_head_ext_compositor_space_positioner_v1;
|
||||||
pub(super) mod jay_head_ext_compositor_space_scaler_v1;
|
pub(super) mod jay_head_ext_compositor_space_scaler_v1;
|
||||||
|
pub(super) mod jay_head_ext_compositor_space_transformer_v1;
|
||||||
pub(super) mod jay_head_ext_core_info_v1;
|
pub(super) mod jay_head_ext_core_info_v1;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
use {
|
||||||
|
crate::{
|
||||||
|
ifs::head_management::{HeadOp, HeadState},
|
||||||
|
utils::transform_ext::TransformExt,
|
||||||
|
wire::{
|
||||||
|
jay_head_ext_compositor_space_transformer_v1::{
|
||||||
|
JayHeadExtCompositorSpaceTransformerV1RequestHandler, SetTransform,
|
||||||
|
SupportedTransform,
|
||||||
|
},
|
||||||
|
jay_head_manager_ext_compositor_space_transformer_v1::JayHeadManagerExtCompositorSpaceTransformerV1RequestHandler,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
jay_config::video::Transform,
|
||||||
|
std::rc::Rc,
|
||||||
|
};
|
||||||
|
|
||||||
|
impl_compositor_space_transformer_v1! {
|
||||||
|
version = 1,
|
||||||
|
after_announce = after_announce,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HeadName {
|
||||||
|
fn after_announce(&self, _shared: &HeadState) {
|
||||||
|
self.send_supported_transform(Transform::None);
|
||||||
|
self.send_supported_transform(Transform::Rotate90);
|
||||||
|
self.send_supported_transform(Transform::Rotate180);
|
||||||
|
self.send_supported_transform(Transform::Rotate270);
|
||||||
|
self.send_supported_transform(Transform::Flip);
|
||||||
|
self.send_supported_transform(Transform::FlipRotate90);
|
||||||
|
self.send_supported_transform(Transform::FlipRotate180);
|
||||||
|
self.send_supported_transform(Transform::FlipRotate270);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn send_supported_transform(&self, transform: Transform) {
|
||||||
|
self.client.event(SupportedTransform {
|
||||||
|
self_id: self.id,
|
||||||
|
transform: transform.to_wl() as _,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl JayHeadManagerExtCompositorSpaceTransformerV1RequestHandler for MgrName {
|
||||||
|
type Error = ErrorName;
|
||||||
|
|
||||||
|
mgr_common_req!();
|
||||||
|
}
|
||||||
|
|
||||||
|
impl JayHeadExtCompositorSpaceTransformerV1RequestHandler for HeadName {
|
||||||
|
type Error = ErrorName;
|
||||||
|
|
||||||
|
head_common_req!();
|
||||||
|
|
||||||
|
fn set_transform(&self, req: SetTransform, _slf: &Rc<Self>) -> Result<(), Self::Error> {
|
||||||
|
self.common.assert_in_transaction()?;
|
||||||
|
let Some(transform) = Transform::from_wl(req.transform as _) else {
|
||||||
|
return Err(ErrorName::UnknownTransform(req.transform));
|
||||||
|
};
|
||||||
|
self.common.push_op(HeadOp::SetTransform(transform))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
error! {
|
||||||
|
#[error("Unknown transform {0}")]
|
||||||
|
UnknownTransform(u32),
|
||||||
|
}
|
||||||
|
|
@ -395,6 +395,12 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
|
||||||
state.position = (x, y);
|
state.position = (x, y);
|
||||||
to_send |= COMPOSITOR_SPACE_INFO_POS;
|
to_send |= COMPOSITOR_SPACE_INFO_POS;
|
||||||
}
|
}
|
||||||
|
HeadOp::SetTransform(t) => {
|
||||||
|
state.transform = t;
|
||||||
|
state.update_size();
|
||||||
|
to_send |= COMPOSITOR_SPACE_INFO_TRANSFORM;
|
||||||
|
to_send |= COMPOSITOR_SPACE_INFO_SIZE;
|
||||||
|
}
|
||||||
HeadOp::SetScale(s) => {
|
HeadOp::SetScale(s) => {
|
||||||
state.scale = s;
|
state.scale = s;
|
||||||
state.update_size();
|
state.update_size();
|
||||||
|
|
@ -463,6 +469,7 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
|
||||||
{
|
{
|
||||||
node.set_position(desired.position.0, desired.position.1);
|
node.set_position(desired.position.0, desired.position.1);
|
||||||
node.set_preferred_scale(desired.scale);
|
node.set_preferred_scale(desired.scale);
|
||||||
|
node.update_transform(desired.transform);
|
||||||
} else if let Some(mi) = &desired.monitor_info {
|
} else if let Some(mi) = &desired.monitor_info {
|
||||||
let pos = &self.client.state.persistent_output_states;
|
let pos = &self.client.state.persistent_output_states;
|
||||||
let pos = match pos.get(&mi.output_id) {
|
let pos = match pos.get(&mi.output_id) {
|
||||||
|
|
@ -483,6 +490,7 @@ impl JayHeadManagerSessionV1RequestHandler for JayHeadManagerSessionV1 {
|
||||||
};
|
};
|
||||||
pos.pos.set(desired.position);
|
pos.pos.set(desired.position);
|
||||||
pos.scale.set(desired.scale);
|
pos.scale.set(desired.scale);
|
||||||
|
pos.transform.set(desired.transform);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
slf.schedule_transaction_result(req.result, None)?;
|
slf.schedule_transaction_result(req.result, None)?;
|
||||||
|
|
|
||||||
15
wire/jay_head_ext_compositor_space_transformer_v1.txt
Normal file
15
wire/jay_head_ext_compositor_space_transformer_v1.txt
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
request destroy (destructor) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
request set_transform {
|
||||||
|
transform: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
event reset_supported_transforms {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
event supported_transform {
|
||||||
|
transform: u32,
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
request destroy (destructor) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
event head {
|
||||||
|
head: id(jay_head_ext_compositor_space_transformer_v1) (new),
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue