Update SCTK to 0.11.0 by kchibisov · Pull Request #1653 · rust-windowing/winit

kchibisov · 2020-08-18T01:13:43Z

Updates smithay-client-toolkit to 0.10.0. The major highlight
of that updated, is update of wayland-rs to 0.27.0. Switching
to wayland-cursor, instead of using libwayland-cursor. It
also fixes the following bugs:

Disabled repeat rate not being handled.
Decoration buttons not working after tty switch.
Scaling not being applied on output reenable.
Crash when XCURSOR_SIZE is 0.
Pointer getting created in some cases without pointer capability.
On kwin, fix space between window and decorations on startup.
Incorrect size event when entering fullscreen when using
client side decorations.
Client side decorations not being hided properly in fullscreen.
Fullscreen state tracking.
Repeat rate triggering multiple times from slow callback handler.
Resizable attribute not being applied properly on startup.

Besides those fixes it also adds a bunch of missing virtual keycodes,
implements proper cursor grabbing, adds right click on decorations
to open application menu, and fall back for cursor icon to similar ones,
if the requested is missing.

It also adds new methods to a Theme trait, such as:

title_font(&self) -> Option<(String, f32)> - The font for a title.
title_color(&self, window_active: bool) -> [u8; 4] - The color of
the text in the title.

Fixes #1680.
Fixes #1678.
Fixes #1676.
Fixes #1646.
Fixes #1614.
Fixes #1601.
Fixes #1533.
Fixes #1509.
Fixes #947.

JMS55 · 2020-08-23T16:48:11Z

I tested this out, it seems window decorations won't show up at all, and while fullscreen now works the first time you press it, exiting it dosen't restore the window size/position correctly (2nd half of #1601).

Gnome 3.36.4/Wayland.

kchibisov · 2020-08-23T16:53:01Z

I tested this out, it seems window decorations won't show up at all, and while fullscreen now works the first time you press it, exiting it dosen't restore the window size/position correctly (2nd half of #1601).

I'm aware of all the issue on GNOME here, please wait a bit, since I've fixed them already. Just they haven't reached that branch. You can track them by the patches I've sent here https://github.com/smithay/client-toolkit/pulls

I'll ping once I'd say that everything is good to test as well as I've ping the issues I'm closing. For now it's hard to test without all the patches I've sent upstream being applied at the same time.

kchibisov · 2020-08-28T14:41:20Z

The major part of patches that I've send upstream was merged. I've finished winit part and created a branch for testing this changes in alacritty/alacritty#4140.

If you'll find any issues with that branch let me know.

chrisduerr

Just some minor bikeshedding about the changelog entries.

CHANGELOG.md

JMS55 · 2020-08-28T16:08:12Z

Amazing work!

Issues:

with_inner_size() isn't working. I request (1440, 810) and get (800, 600). X11 works fine.
VirtualKeyCode::Minus/Subtract is weird. The - button to the right of 0 on my keyboard seems to map to Minus on Wayland, and Subtract on X11. Not sure if Wayland or X11 is wrong, I don't have macOS/Windows to test what they give.
- This is not a new problem, I've been doing Some(VirtualKeyCode::Minus) | Some(VirtualKeyCode::Subtract) to get around it for stable winit, but since you changed some VirtualKeyCodes I'll bring it up here.

kchibisov · 2020-08-28T16:14:17Z

Could you check what the size is https://github.com/rust-windowing/winit/pull/1653/files#diff-65ea0109d004c94225653a3937f9c145R97-R100 here? It'll be strange if with_inner_size won't work, since I clearly apply it there.

JMS55 · 2020-08-28T16:20:14Z

Sorry, I'm not sure what your link is supposed to show.
I did WindowBuilder::with_inner_size(), and then right after building the window, dbg!(window.inner_size()).
I got different numbers.

JMS55 · 2020-08-28T16:21:39Z

Also, please document that winit::platform::unix::Theme uses ARGB values, and not RGBA like I would expect.

kchibisov · 2020-08-28T16:23:50Z

Also, please document that winit::platform::unix::Theme uses ARGB values, and not RGBA like I would expect.

Have you seen that https://github.com/kchibisov/winit/blob/7d05df985eb61f777d5806778f7bab1b838e96d6/src/platform/unix.rs#L474 ?

JMS55 · 2020-08-28T16:25:17Z

Ah that's good, I was looking at the stable docs for winit I think, my bad.

JMS55 · 2020-08-28T16:38:19Z

Another bug: When setting the Theme, the title doesn't show. I tried overriding title_color(), but it changes the button's icons color instead.

chrisduerr · 2020-08-28T19:09:00Z

VirtualKeyCode::Minus/Subtract is weird. The - button to the right of 0 on my keyboard seems to map to Minus on Wayland, and Subtract on X11. Not sure if Wayland or X11 is wrong, I don't have macOS/Windows to test what they give.

This is not a new problem, I've been doing Some(VirtualKeyCode::Minus) | Some(VirtualKeyCode::Subtract) to get around it for stable winit, but since you changed some VirtualKeyCodes I'll bring it up here.

Minus is for the "normal" key while Subtract is for the keypad. Unfortunately I believe not all platforms are aware of this leading to an inconsistent mess. I believe X11 does this wrong for example, even though the keycode names sent by X11are called "minus" and "subtract".

kchibisov · 2020-08-28T22:52:49Z

Another bug: When setting the Theme, the title doesn't show. I tried overriding title_color(), but it changes the button's icons color instead.

That's a very old bug, I'm not sure that it ever worked correctly.

kchibisov · 2020-08-29T18:17:28Z

Sorry, I'm not sure what your link is supposed to show.
I did WindowBuilder::with_inner_size(), and then right after building the window, dbg!(window.inner_size()).
I got different numbers.

Could you recheck size again?

JMS55 · 2020-08-30T02:15:33Z

Size works! The only major bug I see left is that with a custom theme, the title text is a bit too small.

kchibisov · 2020-08-30T02:27:31Z

Have you tried using larger size here https://github.com/kchibisov/winit/blob/a141f0c19d839c5ab93282df8b35e477c6f55fa4/src/platform/unix.rs#L514 ?

JMS55 · 2020-08-30T02:47:53Z

Ah, it looks like the default theme uses ("sans", 17.0). Maybe the Theme trait should copy that.

lberrymage · 2020-09-24T05:33:20Z

Well I made some custom scenarios with wgpu and used the bevy game engine examples which also use wgpu. But yeah, I was making sure to render things.

kchibisov · 2020-09-24T10:46:09Z

Well I made some custom scenarios with wgpu and used the bevy game engine examples which also use wgpu. But yeah, I was making sure to render things.

Thanks.

aentity · 2020-09-24T21:29:56Z

This is last item for 0.23 release, seems need rebase, but otherwise, nothing is left before merge?

kchibisov · 2020-09-24T21:31:58Z

This is last item for 0.23 release, seems need rebase, but otherwise, nothing is left before merge?

It's missing a 'review'. At least source level review should be performed. I actually have a bit more Wayland patched pending, which I want to have in 0.23 as well...

Updates smithay-client-toolkit to 0.11.0. The major highlight of that updated, is update of wayland-rs to 0.27.0. Switching to wayland-cursor, instead of using libwayland-cursor. It also fixes the following bugs: - Disabled repeat rate not being handled. - Decoration buttons not working after tty switch. - Scaling not being applied on output reenable. - Crash when `XCURSOR_SIZE` is `0`. - Pointer getting created in some cases without pointer capability. - On kwin, fix space between window and decorations on startup. - Incorrect size event when entering fullscreen when using client side decorations. - Client side decorations not being hided properly in fullscreen. - Size tracking between fullscreen/tiled state changes. - Repeat rate triggering multiple times from slow callback handler. - Resizable attribute not being applied properly on startup. Besides those fixes it also adds a bunch of missing virtual key codes, implements proper cursor grabbing, adds right click on decorations to open application menu, disabled maximize button for non-resizeable window, and fall back for cursor icon to similar ones, if the requested is missing. It also adds new methods to a `Theme` trait, such as: - `title_font(&self) -> Option<(String, f32)>` - The font for a title. - `title_color(&self, window_active: bool) -> [u8; 4]` - The color of the text in the title. Fixes rust-windowing#1680. Fixes rust-windowing#1678. Fixes rust-windowing#1676. Fixes rust-windowing#1646. Fixes rust-windowing#1614. Fixes rust-windowing#1601. Fixes rust-windowing#1533. Fixes rust-windowing#1509. Fixes rust-windowing#947.

This commit implemenets IME handling via text-input-v3 protocol and so winit's IME related interfaces are now implemented. Fixes rust-windowing#952.

kchibisov · 2020-09-24T23:58:54Z

I've also added IME handling via text input v3, if someone out side of the GNOME can test it, it'll be nice. On GNOME it's hard to test it, since GNOME bugs quite a lot with text-input from my testing, even though I handle every event correctly. GTK apps are working 'kind of fine', because they are not using text-input-v3, but some side channel, like XIM.

Cargo.toml

src/platform/unix.rs

src/platform_impl/linux/wayland/env.rs

src/platform_impl/linux/wayland/window/mod.rs

src/platform_impl/linux/wayland/window/shim.rs

Previously WinitState was carrying a lot of inner mutable data, however we can put entire WinitState into 'Rc<RefCell<_>>' to avoid extensive borrows in callback processing.

src/platform_impl/linux/wayland/event_loop/mod.rs

src/platform_impl/linux/wayland/event_loop/proxy.rs

src/platform_impl/linux/wayland/seat/pointer/mod.rs

src/platform_impl/linux/wayland/window/mod.rs

src/platform_impl/linux/wayland/window/shim.rs

JMS55 · 2020-09-26T18:04:35Z

Theme::titlebar_element_color() Doesn't seem to ever get passed false for window_active. It's always called with true for some reason.

kchibisov · 2020-09-26T18:06:19Z

Theme::titlebar_element_color() Doesn't seem to ever get passed false for window_active. It's always called with true for some reason.

I've noticed that already, will fix when will be addressing the pending review.

src/platform/unix.rs

src/platform_impl/linux/wayland/window/mod.rs

chrisduerr

I don't like the theme's foreground flag, since it's not entirely clear and thus makes things a bit difficult, but I don't have any concrete suggestions to improve it.

But since changing that would likely be breaking, it probably makes sense to think about that again.

kchibisov marked this pull request as draft August 18, 2020 01:14

This was referenced Aug 18, 2020

Update wayland-client to 0.27 rust-windowing/glutin#1323

Merged

Update winit to smithay-client-toolkit 0.10 alacritty/alacritty#4140

Closed

kchibisov force-pushed the wayland-rework branch 2 times, most recently from 3dd77d6 to e284cfe Compare August 18, 2020 01:47

This was referenced Aug 20, 2020

Sctk8 #1544

Closed

[Wayland] Slow keypress handler causes the event to trigger multiple times #1614

Closed

kchibisov mentioned this pull request Aug 28, 2020

On Wayland, add missing virtual key codes mappings #1534

Closed

8 tasks

kchibisov force-pushed the wayland-rework branch from e284cfe to 482da39 Compare August 28, 2020 14:30

chrisduerr reviewed Aug 28, 2020

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

kchibisov force-pushed the wayland-rework branch from c1864f1 to a141f0c Compare August 29, 2020 18:31

kchibisov force-pushed the wayland-rework branch from a141f0c to d831957 Compare August 30, 2020 16:28

kchibisov changed the title ~~Update SCTK to 0.10.0~~ Update SCTK to 0.11.0 Aug 30, 2020

kchibisov marked this pull request as ready for review August 30, 2020 16:28

chrisduerr self-requested a review September 23, 2020 22:00

kchibisov force-pushed the wayland-rework branch from 53c36ca to 1590826 Compare September 24, 2020 16:24

kchibisov force-pushed the wayland-rework branch from c00020f to 3a71b3f Compare September 24, 2020 23:53

On Wayland, add support for set_ime_position

d6486a9

This commit implemenets IME handling via text-input-v3 protocol and so winit's IME related interfaces are now implemented. Fixes rust-windowing#952.

kchibisov force-pushed the wayland-rework branch from 3a71b3f to d6486a9 Compare September 24, 2020 23:55

chrisduerr suggested changes Sep 25, 2020

View reviewed changes

Refactor WinitState usage.

dee6e42

Previously WinitState was carrying a lot of inner mutable data, however we can put entire WinitState into 'Rc<RefCell<_>>' to avoid extensive borrows in callback processing.

kchibisov force-pushed the wayland-rework branch from 84bcb2d to dee6e42 Compare September 25, 2020 16:25

kchibisov added 3 commits September 26, 2020 02:13

Fix style issues.

81eff8a

Optimize WindowUpdate handling and improve docs

979b366

Rework Theme trait.

a2fc19b

kchibisov force-pushed the wayland-rework branch from 5974868 to a2fc19b Compare September 26, 2020 03:12

kchibisov requested a review from chrisduerr September 26, 2020 03:12

elinorbgr reviewed Sep 26, 2020

View reviewed changes

Fix theme and address review comments

e836b0f

kchibisov requested a review from elinorbgr September 26, 2020 18:27

chrisduerr suggested changes Sep 26, 2020

View reviewed changes

src/platform/unix.rs Show resolved Hide resolved

src/platform/unix.rs Outdated Show resolved Hide resolved

src/platform/unix.rs Outdated Show resolved Hide resolved

src/platform_impl/linux/wayland/window/mod.rs Outdated Show resolved Hide resolved

Reorder and shorten Theme trait methods + style update

bd212f0

kchibisov requested a review from chrisduerr September 26, 2020 22:32

chrisduerr approved these changes Sep 27, 2020

View reviewed changes

elinorbgr approved these changes Sep 28, 2020

View reviewed changes

kchibisov merged commit 3d85af0 into rust-windowing:master Sep 28, 2020

Conversation

kchibisov commented Aug 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JMS55 commented Aug 23, 2020

Uh oh!

kchibisov commented Aug 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kchibisov commented Aug 28, 2020

Uh oh!

chrisduerr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JMS55 commented Aug 28, 2020

Amazing work!

Uh oh!

kchibisov commented Aug 28, 2020

Uh oh!

JMS55 commented Aug 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JMS55 commented Aug 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kchibisov commented Aug 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JMS55 commented Aug 28, 2020

Uh oh!

JMS55 commented Aug 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrisduerr commented Aug 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kchibisov commented Aug 28, 2020

Uh oh!

kchibisov commented Aug 29, 2020

Uh oh!

JMS55 commented Aug 30, 2020

Uh oh!

kchibisov commented Aug 30, 2020

Uh oh!

JMS55 commented Aug 30, 2020

Uh oh!

lberrymage commented Sep 24, 2020

Uh oh!

kchibisov commented Sep 24, 2020

Uh oh!

aentity commented Sep 24, 2020

Uh oh!

kchibisov commented Sep 24, 2020

Uh oh!

kchibisov commented Sep 24, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JMS55 commented Sep 26, 2020

Uh oh!

kchibisov commented Sep 26, 2020

kchibisov commented Aug 18, 2020 •

edited

Loading

kchibisov commented Aug 23, 2020 •

edited

Loading

JMS55 commented Aug 28, 2020 •

edited

Loading

JMS55 commented Aug 28, 2020 •

edited

Loading

kchibisov commented Aug 28, 2020 •

edited

Loading

JMS55 commented Aug 28, 2020 •

edited

Loading

chrisduerr commented Aug 28, 2020 •

edited

Loading