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

output: Store position as u32 and offset bad configs

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-06-26 13:05:25 +02:00 • committed by Victoria Brekenfeld
parent 9cd553e128
commit 26ccb653b7
5 changed files with 66 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
use smithay::output::Output;
use smithay::{output::Output, utils::Point};
use tracing::{error, warn};
use crate::{
@ -31,7 +31,7 @@ impl State {
fn output_configuration(
&mut self,
test_only: bool,
conf: Vec<(Output, OutputConfiguration)>,
mut conf: Vec<(Output, OutputConfiguration)>,
) -> bool {
if conf
.iter()
@ -40,6 +40,47 @@ impl State {
return false; // we don't allow the user to accidentally disable all their outputs
}
// sanitize negative positions
{
let (offset_x, offset_y) = conf.iter().fold((0, 0), |mut offset, (_, conf)| {
if let OutputConfiguration::Enabled {
position: Some(position),
..
} = conf
{
if position.x.is_negative() {
offset.0 = offset.0.max(position.x.abs());
}
if position.y.is_negative() {
offset.1 = offset.1.max(position.y.abs());
}
}
offset
});
if offset_x > 0 || offset_y > 0 {
for (output, conf) in conf.iter_mut() {
if let OutputConfiguration::Enabled {
ref mut position, ..
} = conf
{
let current_config = output
.user_data()
.get::<RefCell<OutputConfig>>()
.unwrap()
.borrow();
*position = Some(
position.unwrap_or(Point::from((
current_config.position.0 as i32,
current_config.position.1 as i32,
))) + Point::from((offset_x, offset_y)),
);
}
}
}
}
let mut backups = Vec::new();
for (output, conf) in &conf {
{
@ -76,7 +117,7 @@ impl State {
current_config.transform = *transform;
}
if let Some(position) = position {
current_config.position = (*position).into();
current_config.position = (position.x as u32, position.y as u32);
}
if let Some(vrr) = adaptive_sync {
current_config.vrr = *vrr;