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

render: fix wlr-screencopy with scaled outputs

Browse source
This commit is contained in:
Julian Orth 2024-02-24 14:15:41 +01:00
parent b078329a50
commit 5f14f56461
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ifs/zwlr_screencopy_frame_v1.rs
View file

@ -52,12 +52,13 @@ impl ZwlrScreencopyFrameV1 {
} }
pub fn send_damage(&self) { pub fn send_damage(&self) {
let pos = self.output.pos.get();
self.client.event(Damage { self.client.event(Damage {
self_id: self.id, self_id: self.id,
x: 0, x: 0,
y: 0, y: 0,
width: self.rect.width() as _, width: pos.width() as _,
height: self.rect.height() as _, height: pos.height() as _,
}); });
} }

9
src/ifs/zwlr_screencopy_manager_v1.rs
View file

@ -97,8 +97,15 @@ impl ZwlrScreencopyManagerV1 {
region: Option<Rect>, region: Option<Rect>,
) -> Result<(), ZwlrScreencopyManagerV1Error> { ) -> Result<(), ZwlrScreencopyManagerV1Error> {
let output = self.client.lookup(output)?; let output = self.client.lookup(output)?;
let mut rect = output.global.position().at_point(0, 0); let mode = output.global.mode.get();
let mut rect = Rect::new_sized(0, 0, mode.width, mode.height).unwrap();
if let Some(region) = region { if let Some(region) = region {
let scale = output.global.preferred_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;
let y2 = (region.y2() as f64 * scale).round() as i32;
let region = Rect::new(x1, y1, x2, y2).unwrap();
rect = rect.intersect(region); rect = rect.intersect(region);
} }
let frame = Rc::new(ZwlrScreencopyFrameV1 { let frame = Rc::new(ZwlrScreencopyFrameV1 {