Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support screen lockers #2959

Merged
merged 16 commits into from
Jun 12, 2023
Merged

Support screen lockers #2959

merged 16 commits into from
Jun 12, 2023

Conversation

wmww
Copy link
Contributor

@wmww wmww commented Jun 8, 2023

@codecov
Copy link

codecov bot commented Jun 8, 2023

Codecov Report

Merging #2959 (ccd1556) into main (6b2d8d8) will decrease coverage by 0.04%.
The diff coverage is 70.07%.

@@            Coverage Diff             @@
##             main    #2959      +/-   ##
==========================================
- Coverage   78.40%   78.36%   -0.04%     
==========================================
  Files        1053     1054       +1     
  Lines       71792    72051     +259     
==========================================
+ Hits        56285    56465     +180     
- Misses      15507    15586      +79     
Impacted Files Coverage Δ
include/miral/miral/wayland_extensions.h 100.00% <ø> (ø)
include/miral/miral/window_info.h 100.00% <ø> (ø)
src/include/server/mir/input/scene.h 100.00% <ø> (ø)
src/include/server/mir/input/surface.h 100.00% <ø> (ø)
...c/include/server/mir/shell/surface_specification.h 100.00% <ø> (ø)
src/miral/wayland_extensions.cpp 90.98% <ø> (ø)
src/miral/window_info.cpp 54.41% <0.00%> (-1.04%) ⬇️
src/miral/window_info_internal.cpp 68.00% <0.00%> (-2.25%) ⬇️
src/miral/window_specification_internal.h 100.00% <ø> (ø)
src/server/input/surface_input_dispatcher.h 100.00% <ø> (ø)
... and 19 more

... and 2 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@wmww
Copy link
Contributor Author

wmww commented Jun 9, 2023

The latest release of Swaylock works with this, but current master doesn't due to swaywm/swaylock#299. I have proposed swaywm/swaylock#300 to fix the problem on their side.

It's also possible for us to add logic into WlSurface that lets it grab the SHM buffer data on attach, but it's unclear if this is desirable (according to @RAOF Weston does the same thing Mir currently does, and the protocol doesn't specify anything about being allowed to destroy buffers before commit.

@wmww
Copy link
Contributor Author

wmww commented Jun 9, 2023

Includes #2961

@wmww wmww marked this pull request as ready for review June 9, 2023 04:32
@AlanGriffiths
Copy link
Contributor

Includes #2961

Rebased as that has landed, and wasn't set as the target

@AlanGriffiths
Copy link
Contributor

The latest release of Swaylock works with this

Note that on 22.04 (swaylock 1.5) we see:

$ swaylock -f
2023-06-12 10:08:11 - [main.c:1186] Compositor does not support the input inhibitor protocol, refusing to run insecurely

OTOH with 23.04 this works

Copy link
Contributor

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks uncontentious.

The question is: do we want to delay landing until we have wlcs tests?

Personally, I'm fine with landing now. But need another opinion (especially as I've committed some "tidy up" to the branch).

Copy link
Collaborator

@Saviq Saviq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The question is: do we want to delay landing until we have wlcs tests?

No point letting it rot.

@Saviq Saviq added this pull request to the merge queue Jun 12, 2023
Merged via the queue into main with commit 2b612b7 Jun 12, 2023
20 checks passed
@Saviq Saviq deleted the screenlock branch June 12, 2023 11:25
@wmww
Copy link
Contributor Author

wmww commented Jul 2, 2023

FYI swaywm/swaylock#300 landed so swaylock shouldn't break for us in future versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants