kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

tree: make scale and position of outputs persistent

Browse source
This commit is contained in:
Julian Orth 2024-03-16 01:36:04 +01:00
parent bc9b1c3638
commit 3eb0f61ec1
16 changed files with 135 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ifs/jay_randr.rs
View file

@ -92,12 +92,12 @@ impl JayRandr {
let pos = global.pos.get();
self.client.event(Output {
self_id: self.id,
scale: global.preferred_scale.get().to_wl(),
scale: global.persistent.scale.get().to_wl(),
width: pos.width(),
height: pos.height(),
x: pos.x1(),
y: pos.y1(),
transform: global.transform.get().to_wl(),
transform: global.persistent.transform.get().to_wl(),
manufacturer: &output.monitor_info.manufacturer,
product: &output.monitor_info.product,
serial_number: &output.monitor_info.serial_number,

2
src/ifs/jay_screencast.rs
View file

@ -181,7 +181,7 @@ impl JayScreencast {
x_off,
y_off,
size,
on.global.transform.get(),
on.global.persistent.transform.get(),
);
self.client.event(Ready {
self_id: self.id,

51
src/ifs/wl_output.rs
View file

@ -13,7 +13,7 @@ use {
rect::Rect,
state::{ConnectorData, State},
time::Time,
tree::OutputNode,
tree::{calculate_logical_size, OutputNode},
utils::{
buffd::{MsgParser, MsgParserError},
clonecell::CloneCell,
@ -75,12 +75,18 @@ pub struct WlOutputGlobal {
pub pending_captures: LinkedList<Rc<ZwlrScreencopyFrameV1>>,
pub destroyed: Cell<bool>,
pub legacy_scale: Cell<u32>,
pub preferred_scale: Cell<crate::scale::Scale>,
pub persistent: Rc<PersistentOutputState>,
}
pub struct PersistentOutputState {
pub transform: Cell<Transform>,
pub scale: Cell<crate::scale::Scale>,
pub pos: Cell<(i32, i32)>,
}
#[derive(Eq, PartialEq, Hash)]
pub struct OutputId {
pub connector: String,
pub manufacturer: String,
pub model: String,
pub serial_number: String,
@ -96,33 +102,26 @@ impl WlOutputGlobal {
name: GlobalName,
state: &Rc<State>,
connector: &Rc<ConnectorData>,
x1: i32,
modes: Vec<backend::Mode>,
mode: &backend::Mode,
manufacturer: &str,
product: &str,
serial_number: &str,
width_mm: i32,
height_mm: i32,
output_id: &Rc<OutputId>,
persistent_state: &Rc<PersistentOutputState>,
) -> Self {
let output_id = Rc::new(OutputId {
manufacturer: manufacturer.to_string(),
model: product.to_string(),
serial_number: serial_number.to_string(),
});
let transform = state
.output_transforms
.borrow()
.get(&output_id)
.copied()
.unwrap_or(Transform::None);
let (width, height) = transform.maybe_swap((mode.width, mode.height));
let (x, y) = persistent_state.pos.get();
let scale = persistent_state.scale.get();
let (width, height) = calculate_logical_size(
(mode.width, mode.height),
persistent_state.transform.get(),
scale,
);
Self {
name,
state: state.clone(),
connector: connector.clone(),
pos: Cell::new(Rect::new_sized(x1, 0, width, height).unwrap()),
output_id,
pos: Cell::new(Rect::new_sized(x, y, width, height).unwrap()),
output_id: output_id.clone(),
mode: Cell::new(*mode),
modes,
node: Default::default(),
@ -132,9 +131,8 @@ impl WlOutputGlobal {
unused_captures: Default::default(),
pending_captures: Default::default(),
destroyed: Cell::new(false),
legacy_scale: Cell::new(1),
preferred_scale: Cell::new(crate::scale::Scale::from_int(1)),
transform: Cell::new(transform),
legacy_scale: Cell::new(scale.round_up()),
persistent: persistent_state.clone(),
}
}
@ -289,7 +287,10 @@ impl WlOutputGlobal {
pub fn pixel_size(&self) -> (i32, i32) {
let mode = self.mode.get();
self.transform.get().maybe_swap((mode.width, mode.height))
self.persistent
.transform
.get()
.maybe_swap((mode.width, mode.height))
}
}
@ -336,7 +337,7 @@ impl WlOutput {
subpixel: SP_UNKNOWN,
make: &self.global.output_id.manufacturer,
model: &self.global.output_id.model,
transform: self.global.transform.get().to_wl(),
transform: self.global.persistent.transform.get().to_wl(),
};
self.client.event(event);
}

4
src/ifs/wl_seat.rs
View file

@ -272,9 +272,9 @@ impl WlSeatGlobal {
let (x, y) = self.get_position();
for output in self.state.root.outputs.lock().values() {
if let Some(hc) = output.hardware_cursor.get() {
let transform = output.global.transform.get();
let transform = output.global.persistent.transform.get();
let render = render | output.hardware_cursor_needs_render.take();
let scale = output.global.preferred_scale.get();
let scale = output.global.persistent.scale.get();
let extents = cursor.extents_at_scale(scale);
let (hc_width, hc_height) = hc.size();
if render {

6
src/ifs/wl_surface.rs
View file

@ -357,10 +357,10 @@ impl WlSurface {
}
output.global.send_enter(self);
old.global.send_leave(self);
if old.global.preferred_scale.get() != output.global.preferred_scale.get() {
if old.global.persistent.scale.get() != output.global.persistent.scale.get() {
self.on_scale_change();
}
if old.global.transform.get() != output.global.transform.get() {
if old.global.persistent.transform.get() != output.global.persistent.transform.get() {
self.send_preferred_buffer_transform();
}
let children = self.children.borrow_mut();
@ -459,7 +459,7 @@ impl WlSurface {
if self.version >= TRANSFORM_SINCE {
self.client.event(PreferredBufferTransform {
self_id: self.id,
transform: self.output.get().global.transform.get().to_wl() as _,
transform: self.output.get().global.persistent.transform.get().to_wl() as _,
});
}
}

3
src/ifs/wl_surface/wp_fractional_scale_v1.rs
View file

@ -44,7 +44,8 @@ impl WpFractionalScaleV1 {
.output
.get()
.global
.preferred_scale
.persistent
.scale
.get()
.to_wl(),
});

2
src/ifs/zwlr_screencopy_manager_v1.rs
View file

@ -100,7 +100,7 @@ impl ZwlrScreencopyManagerV1 {
let mode = output.global.mode.get();
let mut rect = Rect::new_sized(0, 0, mode.width, mode.height).unwrap();
if let Some(region) = region {
let scale = output.global.preferred_scale.get().to_f64();
let scale = output.global.persistent.scale.get().to_f64();
let x1 = (region.x1() as f64 * scale).round() as i32;
let y1 = (region.y1() as f64 * scale).round() as i32;
let x2 = (region.x2() as f64 * scale).round() as i32;