pogmommy/multibg-wayland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support output transforms having 90 degree rotations

Browse source 
Swap the physical width and height of an output for our calculations
if the output has a transform that includes a 90 degree rotation

This tries to fix the issue with broken wallpapers on rotated outputs
https://github.com/gergo-salyi/multibg-sway/issues/9
This commit is contained in:
Gergő Sályi 2024-10-09 16:09:33 +02:00
parent 4e640ad6e7
commit a34ee177d0
1 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/wayland.rs
View file

@ -23,7 +23,7 @@ use smithay_client_toolkit::{
use smithay_client_toolkit::reexports::client::{ use smithay_client_toolkit::reexports::client::{
Connection, Dispatch, Proxy, QueueHandle, Connection, Dispatch, Proxy, QueueHandle,
protocol::{ protocol::{
wl_output::{self, WlOutput}, wl_output::{self, Transform, WlOutput},
wl_shm, wl_shm,
wl_surface::WlSurface wl_surface::WlSurface
}, },
@ -212,6 +212,26 @@ impl OutputHandler for State {
return; return;
} }
let (width, height) = {
match info.transform {
Transform::Normal
| Transform::_180
| Transform::Flipped
| Transform::Flipped180 => (width, height),
Transform::_90
| Transform::_270
| Transform::Flipped90
| Transform::Flipped270 => (height, width),
_ => {
warn!(
"New output '{}' has unsupported transform",
output_name
);
(width, height)
}
}
};
let integer_scale_factor = info.scale_factor; let integer_scale_factor = info.scale_factor;
let Some((logical_width, logical_height)) = info.logical_size let Some((logical_width, logical_height)) = info.logical_size
@ -233,9 +253,9 @@ impl OutputHandler for State {
debug!( debug!(
"New output, name: {}, resolution: {}x{}, integer scale factor: {}, \ "New output, name: {}, resolution: {}x{}, integer scale factor: {}, \
logical size: {}x{}", logical size: {}x{}, transform: {:?}",
output_name, width, height, integer_scale_factor, output_name, width, height, integer_scale_factor,
logical_width, logical_height logical_width, logical_height, info.transform
); );
let layer = self.layer_shell.create_layer_surface( let layer = self.layer_shell.create_layer_surface(
@ -372,6 +392,26 @@ logical size: {}x{}",
return; return;
} }
let (width, height) = {
match info.transform {
Transform::Normal
| Transform::_180
| Transform::Flipped
| Transform::Flipped180 => (width, height),
Transform::_90
| Transform::_270
| Transform::Flipped90
| Transform::Flipped270 => (height, width),
_ => {
warn!(
"Updated output '{}' has unsupported transform",
output_name
);
(width, height)
}
}
};
let integer_scale_factor = info.scale_factor; let integer_scale_factor = info.scale_factor;
let Some((logical_width, logical_height)) = info.logical_size let Some((logical_width, logical_height)) = info.logical_size
@ -393,9 +433,9 @@ logical size: {}x{}",
debug!( debug!(
"Updated output, name: {}, resolution: {}x{}, integer scale factor: {}, \ "Updated output, name: {}, resolution: {}x{}, integer scale factor: {}, \
logical size: {}x{}", logical size: {}x{}, transform: {:?}",
output_name, width, height, integer_scale_factor, output_name, width, height, integer_scale_factor,
logical_width, logical_height logical_width, logical_height, info.transform
); );
let Some(bg_layer) = self.background_layers.iter_mut() let Some(bg_layer) = self.background_layers.iter_mut()
@ -410,8 +450,8 @@ logical size: {}x{}",
if bg_layer.width != width || bg_layer.height != height { if bg_layer.width != width || bg_layer.height != height {
warn!( warn!(
"Handling of output mode changes are not implemented. \ "Handling of output mode or transform changes are not yet implemented. \
Restart multibg-sway or expect low wallpaper quality due to scaling" Restart multibg-sway or expect broken wallpapers or low quality due to scaling"
); );
} }