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

refactor(output config): move to config crate

Browse source 
this allows the greeter to easily sync to the user config
This commit is contained in:
Ashley Wulber 2025-08-19 16:51:37 -04:00 • committed by Ashley Wulber
parent 4a385d5535
commit 416b66b776
17 changed files with 283 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use cosmic_comp_config::output::{OutputConfig, OutputState, TransformDef};
use smithay::{output::Output, utils::Point};
use tracing::{error, warn};
use crate::{
config::{OutputConfig, OutputState},
state::State,
utils::prelude::OutputExt,
wayland::protocols::output_configuration::{
@ -123,7 +123,16 @@ impl State {
current_config.scale = *scale;
}
if let Some(transform) = transform {
current_config.transform = *transform;
current_config.transform = match transform {
smithay::utils::Transform::Normal => TransformDef::Normal,
smithay::utils::Transform::_90 => TransformDef::_90,
smithay::utils::Transform::_180 => TransformDef::_180,
smithay::utils::Transform::_270 => TransformDef::_270,
smithay::utils::Transform::Flipped => TransformDef::Flipped,
smithay::utils::Transform::Flipped90 => TransformDef::Flipped90,
smithay::utils::Transform::Flipped180 => TransformDef::Flipped180,
smithay::utils::Transform::Flipped270 => TransformDef::Flipped270,
}
}
if let Some(position) = position {
current_config.position = (position.x as u32, position.y as u32);

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

@ -14,6 +14,8 @@ use smithay::{
},
};
use cosmic_comp_config::output::OutputState as EnabledState;
use cosmic_protocols::output_management::v1::server::{
zcosmic_output_configuration_head_v1::{self, ZcosmicOutputConfigurationHeadV1},
zcosmic_output_configuration_v1::{self, ZcosmicOutputConfigurationV1},
@ -21,7 +23,7 @@ use cosmic_protocols::output_management::v1::server::{
zcosmic_output_manager_v1::{self, ZcosmicOutputManagerV1},
};
use crate::{config::OutputState as EnabledState, wayland::protocols::output_configuration::*};
use crate::wayland::protocols::output_configuration::*;
impl<D> GlobalDispatch<ZcosmicOutputManagerV1, OutputMngrGlobalData, D>
for OutputConfigurationState<D>

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

@ -4,6 +4,7 @@ use calloop::{
timer::{TimeoutAction, Timer},
LoopHandle,
};
use cosmic_comp_config::output::AdaptiveSync;
use cosmic_protocols::output_management::v1::server::{
zcosmic_output_configuration_head_v1::ZcosmicOutputConfigurationHeadV1,
zcosmic_output_configuration_v1::ZcosmicOutputConfigurationV1,
@ -580,4 +581,4 @@ macro_rules! delegate_output_configuration {
}
pub(crate) use delegate_output_configuration;
use crate::{config::AdaptiveSync, utils::prelude::OutputExt};
use crate::utils::prelude::OutputExt;