feat: support mutiscreen when slurp #40

Decodetalkers · 2023-05-25T03:28:56Z

fix: #8

Shinyzenith · 2023-05-25T16:48:17Z

wayshot/src/wayshot.rs


-    let frame_copy: libwayshot::FrameCopy = if args.is_present("slurp") {
+    let frame_copy: (Vec<libwayshot::FrameCopy>, Option<(i32, i32)>) = if args.is_present("slurp") {
+        let mut copies = Vec::new();


What does copies signify in this patch? Can we possibly try a better name?

Shinyzenith · 2023-05-25T16:50:38Z

wayshot/src/wayshot.rs


            if !(width <= 0 || height <= 0) {
-                intersecting_outputs.push(output);
+                let truex = region.x_coordinate - output.dimensions.x;


Suggested change

let truex = region.x_coordinate - output.dimensions.x;

let true_x = region.x_coordinate - output.dimensions.x;

Shinyzenith · 2023-05-25T16:50:59Z

wayshot/src/wayshot.rs

            if !(width <= 0 || height <= 0) {
-                intersecting_outputs.push(output);
+                let truex = region.x_coordinate - output.dimensions.x;
+                let truey = region.y_coordinate - output.dimensions.y;


Suggested change

let truey = region.y_coordinate - output.dimensions.y;

let true_y = region.y_coordinate - output.dimensions.y;

Shinyzenith · 2023-05-25T16:51:14Z

wayshot/src/wayshot.rs

-                intersecting_outputs.push(output);
+                let truex = region.x_coordinate - output.dimensions.x;
+                let truey = region.y_coordinate - output.dimensions.y;
+                let trueregion = CaptureRegion {


Suggested change

let trueregion = CaptureRegion {

let true_region = CaptureRegion {

Shinyzenith · 2023-05-25T16:51:26Z

wayshot/src/wayshot.rs

+                };
+                intersecting_outputs.push(MutiCaptureMessage {
+                    output: output.wl_output.clone(),
+                    region: trueregion,


Suggested change

region: trueregion,

region: true_region,

Shinyzenith · 2023-05-25T16:52:23Z

wayshot/src/wayshot.rs

+                &mut globals,
+                &mut conn,
+                cursor_overlay,
+                ouputinfos.output.clone(),


Suggested change

ouputinfos.output.clone(),

output_info.output.clone(),

Shinyzenith · 2023-05-25T16:52:37Z

wayshot/src/wayshot.rs

+                &mut conn,
+                cursor_overlay,
+                ouputinfos.output.clone(),
+                Some(ouputinfos.region),


Suggested change

Some(ouputinfos.region),

Some(output_info.region),

Shinyzenith · 2023-05-25T16:55:40Z

wayshot/src/wayshot.rs

+                &mut conn,
+                cursor_overlay,
+                output,
+                None,


Would it be efficient to capture the entire wl_output? Maybe we should consider passing in the intersecting region only.

what do you mean about entire wl_output? maybe combining all screens together to one image?

mstoekcl one just concat the screens, if you want to capture the whole region, just caculate the biggest region, from the min (x, y) to the max (x, y), make every screen capture once, resize and overlay the images together, then we get the whole screens image

Shinyzenith · 2023-05-25T16:58:00Z

wayshot/src/wayshot.rs

+                output,
+                None,
+            )?],
+            None,


Once again, maybe we should consider exporting the intersecting capture region and then blit the resulting output to the final buffer.

wayshot/src/wayshot.rs

Shinyzenith · 2023-05-25T17:02:08Z

For reference: https://github.com/mstoeckl/wayshot/tree/multi-output
The following patch also adds the same functionality. It is however from before the libwayshot split hence might be hard to follow along with but the logic remains untouched.

Shinyzenith · 2023-06-01T02:03:13Z

Apart from some minor style issues ( which I will fix after merging ), the code seems to be fine. We can do a better job of abstracting some areas which I'll also take upon myself.

Waiting to merge before I can actually test the patch or have someone test it locally.

mstoeckl · 2023-06-24T17:41:41Z

Waiting to merge before I can actually test the patch or have someone test it locally.

I finally had some time to look at and test this. (Inside sway, I ran WLR_WL_OUTPUTS=2 sway to create a two-output nested instance, and then made a number of screenshots, using commands like swaymsg output WL-2 scale 1.5 and swaymsg output WL-2 transform flipped-180 to change output scales and apply output transforms.)

I've only noticed one issue so far: transformed outputs are not properly handled; the screenshot buffers need to be untransformed and composited in the right location. However, transformed outputs also having rotated screenshot images may also be an issue with the original wayshot -- or possibly even the protocol https://wayland.app/protocols/wlr-screencopy-unstable-v1 itself, which does not appear to explain whether the buffers received are transformed. Either way, I still consider this PR to be a strict improvement.

Shinyzenith · 2023-06-26T06:47:08Z

I finally had some time to look at and test this. (Inside sway, I ran WLR_WL_OUTPUTS=2 sway to create a two-output nested instance, and then made a number of screenshots, using commands like swaymsg output WL-2 scale 1.5 and swaymsg output WL-2 transform flipped-180 to change output scales and apply output transforms.)

Hey! Thanks once again for taking a look ❤️.

I've only noticed one issue so far: transformed outputs are not properly handled; the screenshot buffers need to be untransformed and composited in the right location. However, transformed outputs also having rotated screenshot images may also be an issue with the original wayshot -- or possibly even the protocol https://wayland.app/protocols/wlr-screencopy-unstable-v1 itself, which does not appear to explain whether the buffers received are transformed. Either way, I still consider this PR to be a strict improvement.

This makes me curious, does this issue occur on grim too? Would you mind testing it out? 😅 I sadly don't have access to anything apart from my laptop at the moment.

mstoeckl · 2023-06-26T23:07:41Z

This makes me curious, does this issue occur on grim too? Would you mind testing it out?

It does not happen with grim. Under Sway, running swaymsg output '*' transform 180 to rotate the display, and capturing a screenshot with grim, produces an image which displays windows right-side-up; doing the same with Wayshot (either original, my test branch, or this PR) produces an image whose windows are upside-down.

Decodetalkers · 2023-06-27T01:37:23Z

This makes me curious, does this issue occur on grim too? Would you mind testing it out?

It does not happen with grim. Under Sway, running swaymsg output '*' transform 180 to rotate the display, and capturing a screenshot with grim, produces an image which displays windows right-side-up; doing the same with Wayshot (either original, my test branch, or this PR) produces an image whose windows are upside-down.

I think we need to get the rotation of the screen, before make them one image, it need to rotate the image to the right place

https://docs.rs/wayland-client/0.30.2/wayland_client/protocol/wl_output/enum.Event.html#variant.Geometry.field.transform

Here, transfrom message need to collected

https://wayland.app/protocols/wayland#wl_output:enum:transform

introduction is here, but I do not know what is a good way to save them in OutputInfo, because they are all in wl_output. so ..

If transform is done, then before https://github.com/waycrate/wayshot/pull/40/files#diff-07c5f12242ede0fe1716dbe6393d6cd3a4eb49b4e440dbfed36a1e4bbc1e0651R266 this line, we need to rotate the image to the right place with the transform we get, then make them together, after that , I think all is done

so this pr just support when all screen is in normal translation

Decodetalkers · 2023-06-27T03:26:06Z

I try to solve transform in my repo,

Decodetalkers/haruhishot@8bc7f4d

but there is still some problem , when rotate with 90 and 270, it cannot shot the right place, I need to see how grim handle it

it seems something wrong with capture_region, I think it is the bug of sway, because rotate 90 degree, capture region from 0, 0, 100, 100, it captures from 2400, 1000, -100, -100, and grim does not use capture_region. it capture all the screens, and caculate where to cut, finally makes an image

Shinyzenith · 2023-06-27T13:22:42Z

wayshot/src/wayshot.rs

+            let mut buff = Cursor::new(Vec::new());
+
+            let mut writer = BufWriter::new(stdout.lock());
+            image_bottom.write_to(&mut buff, image::ImageFormat::Png)?;


I think I didn't notice this line, but should we not take the users defined extension format into consideration here instead of hardcoding png or am I mistaken? @Decodetalkers

sorry, I have missed that

Shinyzenith · 2023-06-27T13:23:26Z

it seems something wrong with capture_region, I think it is the bug of sway, because rotate 90 degree, capture region from 0, 0, 100, 100, it captures from 2400, 1000, -100, -100, and grim does not use capture_region. it capture all the screens, and caculate where to cut, finally makes an image

I see I'll try and test this theory.

Shinyzenith · 2023-06-27T13:24:17Z

introduction is here, but I do not know what is a good way to save them in OutputInfo, because they are all in wl_output. so ..

I think we can query the transform and keep it in a transform field in OutputInfo right?

Shinyzenith · 2023-06-27T13:25:25Z

This makes me curious, does this issue occur on grim too? Would you mind testing it out?

It does not happen with grim. Under Sway, running swaymsg output '*' transform 180 to rotate the display, and capturing a screenshot with grim, produces an image which displays windows right-side-up; doing the same with Wayshot (either original, my test branch, or this PR) produces an image whose windows are upside-down.

I can reproduce this issue under swayfx.

Closes: #7 Closes: #8 Supercedes: #40 Signed-off-by: Decodetalkers <[email protected]> Signed-off-by: Shinyzenith <[email protected]>

Shinyzenith · 2023-07-03T06:54:53Z

Completed in: #41

Shinyzenith · 2023-07-03T06:55:05Z

Thank you for all your help and contributions ❤️

Decodetalkers mentioned this pull request May 25, 2023

Question Decodetalkers/haruhishot#6

Open

Decodetalkers force-pushed the supportmutiscreen branch from f91811c to b690fc3 Compare May 25, 2023 03:30

Shinyzenith reviewed May 25, 2023

View reviewed changes

feat: support mutiscreen when slurp

929a396

Decodetalkers force-pushed the supportmutiscreen branch from 4e0677c to 929a396 Compare May 26, 2023 01:55

chore: support whole region

cb68d82

Decodetalkers force-pushed the supportmutiscreen branch from 2ffa974 to cb68d82 Compare May 26, 2023 02:08

chore: code style adjust

047137a

Decodetalkers force-pushed the supportmutiscreen branch from b6e24cb to 047137a Compare May 26, 2023 02:50

Decodetalkers requested a review from Shinyzenith May 30, 2023 01:53

Shinyzenith previously approved these changes Jun 1, 2023

View reviewed changes

Shinyzenith reviewed Jun 27, 2023

View reviewed changes

chore: user defined encode

1a30bc5

Decodetalkers dismissed Shinyzenith’s stale review via 1a30bc5 June 27, 2023 13:48

Shinyzenith approved these changes Jun 27, 2023

View reviewed changes

Shinyzenith mentioned this pull request Jun 27, 2023

[Feat] Multi-output composited screenshots #41

Merged

Shinyzenith added a commit that referenced this pull request Jun 27, 2023

[Feat] Multi-output composited screenshots

63ab617

Closes: #7 Closes: #8 Supercedes: #40 Signed-off-by: Decodetalkers <[email protected]> Signed-off-by: Shinyzenith <[email protected]>

Shinyzenith added a commit that referenced this pull request Jul 2, 2023

[Feat] Multi-output composited screenshots

29f90d3

Closes: #7 Closes: #8 Supercedes: #40 Signed-off-by: Decodetalkers <[email protected]> Signed-off-by: Shinyzenith <[email protected]>

Shinyzenith force-pushed the main branch from 4a0f80e to 4c931b1 Compare July 2, 2023 17:20

Shinyzenith closed this Jul 3, 2023

	let truex = region.x_coordinate - output.dimensions.x;
	let true_x = region.x_coordinate - output.dimensions.x;

	let truey = region.y_coordinate - output.dimensions.y;
	let true_y = region.y_coordinate - output.dimensions.y;

	let trueregion = CaptureRegion {
	let true_region = CaptureRegion {

Uh oh!

feat: support mutiscreen when slurp #40

feat: support mutiscreen when slurp #40

Uh oh!

Conversation

Decodetalkers commented May 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Shinyzenith commented May 25, 2023

Uh oh!

Shinyzenith commented Jun 1, 2023

Uh oh!

mstoeckl commented Jun 24, 2023

Uh oh!

Shinyzenith commented Jun 26, 2023

Uh oh!

mstoeckl commented Jun 26, 2023

Uh oh!

Decodetalkers commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Decodetalkers commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Shinyzenith commented Jun 27, 2023

Uh oh!

Shinyzenith commented Jun 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Shinyzenith commented Jun 27, 2023

Uh oh!

Shinyzenith commented Jul 3, 2023

Uh oh!

Shinyzenith commented Jul 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

Decodetalkers commented May 25, 2023 •

edited

Loading

Decodetalkers commented Jun 27, 2023 •

edited

Loading

Decodetalkers commented Jun 27, 2023 •

edited

Loading

Shinyzenith commented Jun 27, 2023 •

edited

Loading