wayland: rebased and merge into master by james-lawrence · Pull Request #2079 · linebender/druid

james-lawrence · 2021-12-06T12:30:47Z

pull all the changes from wayland into master since we're down to just a few missing pieces in wayland (mostly pieces also missing within the x11 backend) time to let it soak in master.

Also use `im` crate to solve reentrancy on windows collection (a group of windows, rather than the ubiquitous Microsoft product).

while not 100% there implements significant improvements to the wayland backend. most (all?) examples seem to basic work. most outstanding work is integrating with the druid APIs cleanly, implement repeating keys, some point work, naturally performance fixes and finally there are some bugs when resuming from sleep.

maan2003 · 2021-12-06T12:58:05Z

We also want CI for wayland backend, probably just need to copy

druid/.github/workflows/ci.yml

Lines 113 to 153 in 2d80ca0

    
             test-stable-gtk: 
        
               runs-on: ubuntu-latest 
        
               name: cargo clippy+test (gtk) 
        
               steps: 
        
                 - uses: actions/checkout@v2 
        
                 - name: install libgtk-3-dev 
        
                   run: | 
        
                     sudo apt update 
        
                     sudo apt install libgtk-3-dev 
        
                 - name: install stable toolchain 
        
                   uses: actions-rs/toolchain@v1 
        
                   with: 
        
                     toolchain: stable 
        
                     components: clippy 
        
                     profile: minimal 
        
                     override: true 
        
                 - name: restore cache 
        
                   uses: Swatinem/rust-cache@v1 
        
                 - name: cargo clippy druid-shell 
        
                   uses: actions-rs/cargo@v1 
        
                   with: 
        
                     command: clippy 
        
                     args: --manifest-path=druid-shell/Cargo.toml --all-targets -- -D warnings 
        
                 - name: cargo test druid-shell 
        
                   uses: actions-rs/cargo@v1 
        
                   with: 
        
                     command: test 
        
                     args: --manifest-path=druid-shell/Cargo.toml 
        
                 # We use --all-targets to skip doc tests; there are no gtk-specific 
        
                 # doctests in the main druid crate anyway 
        
                 - name: cargo test druid 
        
                   uses: actions-rs/cargo@v1 
        
                   with: 
        
                     command: test 
        
                     args: --manifest-path=druid/Cargo.toml --all-targets --features=svg,image,im

james-lawrence · 2021-12-06T13:08:22Z

agreed, can do it as part of the next PR if you want. CI env is very different than my environment, which isn't an issue but don't want to think about it for this one. =)

maan2003 · 2021-12-06T14:15:06Z

I can do it tomorrow. wanted it because cargo clippy --features wayland --no-default-features generates 107 warnings 😅
(most should be fixed by cargo clippy --features wayland --no-default-features -Z unstable-options --fix)

maan2003 · 2021-12-07T13:42:52Z

can you add the following commits:
maan2003/druid@33b31ba - add CI for wayland
maan2003/druid@3fe57bb - fixes bug in build.rs
maan2003/druid@8a5884c - disable ApplicationExt static assertion for wayland
maan2003/druid@3c9591c - fixes most of clippy warnings

maan2003 · 2021-12-07T13:49:34Z

also squash 11d72d8 and c3d7fdb

removes the need to use some unsafe code.

allows for us to replace inner surfaces dynamically. (necessary for layershells).

fix minor issue with global id

- fixes a seg fault when resizing the current window. - fixes a bug where even if no seg fault happens we skip painting.

while these changes don't fully implement a working copy/paste. I have confirm that when Clipboard::get_string is invoked the contents from the system clipboard are returned.

- bunch of other misc cleanups

- refactors some of the wayland connection code out of the application startup.

james-lawrence · 2021-12-08T22:09:47Z

@emersion we talked, your concerns were understood. using unstable protocols by default comes with that risk. I'd expect the same potential risks from any of the unstable protocols. this isn't news to anyone. same with the xdg_output, or layershell.

if it breaks its entirely not your problem.

emersion · 2021-12-08T22:19:05Z

No, it has nothing to do about the protocols being "unstable". "unstable" protocols (in wayland-protocols parlance) just means that a separate protocol may supersede it at some point, but "unstable" protocols never see backwards-incompatible changes. See the wayland-protocols README.

In other words, even if you use an "unstable" protocol, your client will never be broken by a protocol update.

What I'm talking about here is very different. I'm saying that I'll make it so your clients won't even launch on purpose, to avoid having other clients be tempted to use privileged protocols they must not use.

this isn't news to anyone

Please take time to understand how Wayland works before making your points.

if it breaks its entirely not your problem.

Yes, it is my problem, because it causes more work for me. I'm already spending a good chunk of time trying to convince you and explain that this pull request is doing the wrong thing.

kennylevinsen · 2021-12-08T22:57:43Z

We have talked it out on IRC, and we're all good. :)

In the wlroots team we're mainly worried about special protocols ending up used by normal clients when such use will be blocked in the future. @james-lawrence explained that this part is going away in the next PR, so while we find it odd that its included here, I guess that's just people having different git workflows.

- remove wlr management api. - allow the application logic to make use of the code.

wayland: display refactor

james-lawrence · 2021-12-11T15:30:59Z

@maan2003 this is ready to go, I pulled in changes from the next branch I was going to PR to resolve @emersion concerns.

makes the PR larger than I wanted and makes it no longer a pure rebase but ./shrug. at this point I think with there will be 1 final small PR around layershell reinitializing unless I encountered something when working on my applications.

I'll be opening up issues around the remaining work once the final PR is in for documentation/disccusion purposes for whomever takes up the torch next. ;)

james-lawrence · 2021-12-14T17:59:10Z

oh and of course I'll be avail if issues crop up.

maan2003

Sorry for such a late review :/

druid-shell/src/backend/shared/keyboard.rs

druid-shell/src/backend/wayland/application.rs

druid-shell/src/backend/wayland/clipboard.rs

druid-shell/src/backend/wayland/util.rs

druid-shell/src/backend/wayland/pointers.rs

druid-shell/src/backend/wayland/outputs/output.rs

druid-shell/src/backend/wayland/surfaces/idle.rs

druid-shell/src/backend/wayland/surfaces/surface.rs

druid-shell/src/backend/wayland/window.rs

maan2003 · 2021-12-30T08:28:39Z

Also, choice of using Rc or Arc feels arbitrary. please explain the reasoning

james-lawrence · 2021-12-30T12:02:32Z

@maan2003 all good, its holiday season. =)

james-lawrence · 2021-12-31T12:08:31Z

@maan2003 generally speaking I recall some comment about moving to arc be default within druid but i could be misremembering.

I'm fairly indifferent to the usage of either outside of what rust itself enforces or performance related issues.

most (all?) of the RC usage is from the original branch I started this work off of. it seems slapdash because why I defaulted to using arcs and original branch defaulted to using RC.

maan2003 · 2021-12-31T12:20:59Z

I recall some comment about moving to arc be default within druid.

that is probably for druid only, we mostly use Rc in druid shell

james-lawrence · 2021-12-31T12:53:37Z

ah then it was a misunderstanding on my end. is the arc/rc stuff a blocker for this PR? would be easier for me to tackle after this is merged to limit the diverging from my private branch.

maan2003 · 2021-12-31T14:12:37Z

is the arc/rc stuff a blocker for this PR?

We can fix it later :)

maan2003

LGTM

druid-shell/examples/empty_window.rs

druid-shell/src/backend/mod.rs

james-lawrence · 2022-01-07T02:13:20Z

@maan2003 bump =) weekend is coming up have some bug fixes in my branch I'm planning on opening another PR for =)

maan2003 · 2022-01-07T04:05:03Z

Sorry, I forgot to merge this.

richard-uk1 and others added 8 commits December 6, 2021 07:16

Save empty backend.

4ca1fd7

implement druid-shell for wayland.

fcfee87

Reduce the number of warnings.

32d1e6c

Also use `im` crate to solve reentrancy on windows collection (a group of windows, rather than the ubiquitous Microsoft product).

log -> tracing

d8413e9

simulate_input

91b71a8

prepare paint

696ae7d

green CI

81cf390

james-lawrence force-pushed the wayland-rebase branch from 6cda60d to 330f3c5 Compare December 6, 2021 12:54

maan2003 and others added 16 commits December 7, 2021 15:33

wayland: share xkb with x11 backend

88cf58d

decouple buffers from surface. (linebender#2032)

1194bbe

removes the need to use some unsafe code.

decouple window handles from wayland id. (linebender#2033)

3500e1e

allows for us to replace inner surfaces dynamically. (necessary for layershells).

remove dead/unused code. (linebender#2035)

104579f

fix minor issue with global id

update wayland dependencies

ba5f362

expose api for display reinitialization support.

6a9b58d

handle output added/removed events on eventqueue.

c800f00

formatting

a90667e

implement locale detection for wayland. (linebender#2059)

2a3ca49

enable buffer recreation to always be allowed. (linebender#2070)

89412ba

- fixes a seg fault when resizing the current window. - fixes a bug where even if no seg fault happens we skip painting.

implement repeating keys. (linebender#2058)

1186cff

attempt to create a working clipboard (linebender#2057)

7ad66e7

while these changes don't fully implement a working copy/paste. I have confirm that when Clipboard::get_string is invoked the contents from the system clipboard are returned.

cleanup popup implementation. (linebender#2071)

41471d7

- bunch of other misc cleanups

implement screen for wayland. (linebender#2076)

804040e

- refactors some of the wayland connection code out of the application startup.

wayland: CI

e7d7d31

xkb: only include xkbcommon-x11.h if x11 feature is enabled

cff899a

james-lawrence and others added 3 commits December 11, 2021 10:09

cleanup the output detect code.

6e62f5e

- remove wlr management api. - allow the application logic to make use of the code.

Merge pull request #1 from james-lawrence/wayland-display-refactor

409981d

wayland: display refactor

cargo fmt

2451da9

james-lawrence force-pushed the wayland-rebase branch from 8fdcd68 to 2451da9 Compare December 11, 2021 15:23

maan2003 reviewed Dec 30, 2021

View reviewed changes

james-lawrence force-pushed the wayland-rebase branch from 1bdb232 to 667ff0e Compare December 31, 2021 12:49

james-lawrence force-pushed the wayland-rebase branch 2 times, most recently from 29335c1 to 4145711 Compare December 31, 2021 13:39

maan2003 approved these changes Jan 1, 2022

View reviewed changes

maan2003 reviewed Jan 1, 2022

View reviewed changes

druid-shell/examples/empty_window.rs Outdated Show resolved Hide resolved

maan2003 reviewed Jan 2, 2022

View reviewed changes

druid-shell/src/backend/mod.rs Outdated Show resolved Hide resolved

peer review

bdf6792

james-lawrence force-pushed the wayland-rebase branch from 4145711 to bdf6792 Compare January 3, 2022 04:55

maan2003 merged commit b11f8ed into linebender:master Jan 7, 2022

maan2003 mentioned this pull request Jan 7, 2022

Wayland #1498

Closed

james-lawrence deleted the wayland-rebase branch January 8, 2022 14:46

ToxicMushroom mentioned this pull request Mar 2, 2023

[gui] sway: Window contents are not rendered on Wayland backend jpochyla/psst#211

Open

Conversation

james-lawrence commented Dec 6, 2021

Uh oh!

maan2003 commented Dec 6, 2021

Uh oh!

james-lawrence commented Dec 6, 2021

Uh oh!

maan2003 commented Dec 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

maan2003 commented Dec 7, 2021

Uh oh!

maan2003 commented Dec 7, 2021

Uh oh!

james-lawrence commented Dec 8, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emersion commented Dec 8, 2021

Uh oh!

kennylevinsen commented Dec 8, 2021

Uh oh!

james-lawrence commented Dec 11, 2021

Uh oh!

james-lawrence commented Dec 14, 2021

Uh oh!

maan2003 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maan2003 commented Dec 30, 2021

Uh oh!

james-lawrence commented Dec 30, 2021

Uh oh!

james-lawrence commented Dec 31, 2021

Uh oh!

maan2003 commented Dec 31, 2021

Uh oh!

james-lawrence commented Dec 31, 2021

Uh oh!

maan2003 commented Dec 31, 2021

Uh oh!

maan2003 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

james-lawrence commented Jan 7, 2022

Uh oh!

maan2003 commented Jan 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

maan2003 commented Dec 6, 2021 •

edited

Loading

james-lawrence commented Dec 8, 2021 •

edited

Loading