window: add client side decorations interface #362

kchibisov · 2023-03-02T15:56:36Z

While the new decorations look the same as the ones before, the
approach in drawing them was changed, and now decorations are more
instant mode, meaning that you create and drop them when needed.

Fixes #273.

--

This series also adds subcompositor and subsurface handlers. The parent surface stuff is
intended to be used from inside winit, yet, I haven't added it into it.

The example which is using CSD decorations is themed_window.

All the drawing was ported from before.

cc @PolyMeilex

kchibisov · 2023-03-02T16:32:18Z

src/shell/xdg/window/mod.rs

@@ -208,8 +208,8 @@ impl Window {
        decoration.data::<WindowData>().and_then(|data| data.0.upgrade()).map(Window)
    }

-    pub fn show_window_menu(&self, seat: &wl_seat::WlSeat, serial: u32, position: (u32, u32)) {
-        self.xdg_toplevel().show_window_menu(seat, serial, position.0 as i32, position.1 as i32);
+    pub fn show_window_menu(&self, seat: &wl_seat::WlSeat, serial: u32, position: (i32, i32)) {


That was wrong, it's i32, because relative to main surface, so could be negative.

kchibisov · 2023-03-02T16:38:33Z

You might notice, that set_hidden is missing, and the reason for it is that you want to hide CSD, you can simply drop the entire frame all together.

src/shell/xdg/frame/fallback_frame.rs

src/shell/xdg/frame/mod.rs

i509VCB · 2023-03-02T17:04:46Z

You might notice, that set_hidden is missing, and the reason for it is that you want to hide CSD, you can simply drop the entire frame all together.

For more heavyweight decorations it seems wasteful to throw away then start from scratch with internal state (the decorations might use EGL). Maybe a compromise for that scenario would be a way to detach decorations from a window and then reattach the decorations?

kchibisov · 2023-03-02T17:10:15Z

For more heavyweight decorations it seems wasteful to throw away then start from scratch with internal state (the decorations might use EGL). Maybe a compromise for that scenario would be a way to detach decorations from a window and then reattach the decorations?

I mean why you should even consume resources when you were asked to use ServerSide again? Right now the API enforces shm, so it's not like you want to use EGL for them, if we want to allow using something other than shm for decorations the init should be different, and likely not attached to the frame, then in this case you might want hide actually.

kchibisov · 2023-03-02T21:43:44Z

I've moved constructor, added back is_hidden and set_hidden.

kchibisov · 2023-03-04T15:51:45Z

I wonder whether we should maybe put it in a separate crate somehow, the current interface has very few connections with Wayland what so ever. Though, Like the trait by itself doesn't force anything specific, other than asking for WlSurface in one place and for WindowStates in other, though the window states could be refactored all together.

What do you think? Though, I'm not sure how compatible it could be though.

kchibisov · 2023-03-07T16:21:56Z

The sctk-adwaita update using this branch PolyMeilex/sctk-adwaita#22 (well, it's my winit branch, but it's a rebase of this one).

The winit patch which implements both sctk-adwaita(might be not yet by the time you click it) and default decorations rust-windowing/winit#2676

kchibisov · 2023-03-08T18:21:52Z

Will need #366 to refactor this further, given right now we pass arrays around. It'll also have the ability to hide certain buttons.

i509VCB · 2023-03-13T22:03:44Z

src/shell/xdg/frame/mod.rs

+/// The interface for the client side decorations.
+pub trait DecorationsFrame: Sized {
+    /// Configurations for this frame.
+    type Config;


I'd argue the config doesn't really need to be part of the frame trait. The config is going to be dependent on the frame type anyways.

I think the goal is to transparently pass it, we might remove it, sure?

i509VCB · 2023-03-13T22:04:25Z

src/shell/xdg/frame/mod.rs

+    /// effect for the end user.
+    fn click_point_moved(&mut self, surface: &WlSurface, x: f64, y: f64) -> Option<&str>;
+
+    /// All clicks left the decorations.


Clarify what was meant here?

it's simply to move pointer away from the decoration frame.

Isn't moving the pointer off the frame possible even without clicking? I do understand that clicking and the client not doing an interactive resize or move is possible.

I could see more advanced decorations possibly highlighting parts of the frame if the pointer went over some point if not clicking.

Isn't moving the pointer off the frame possible even without clicking?

Ah, guess comment is what actually confuses you? because it should probably be all click points left the decorations.

Be aware that I use click terminology to show that we're not talking about wl_pointer events in the first place, you could use all other sorts of inputs with it, like touch.

The use case for such API is to simply leave so Hovered state will go away, for example when clicking on minimize button and then restoring back.

kchibisov · 2023-03-17T04:27:39Z

I don't think I have anything else left for this.

src/shell/xdg/frame/mod.rs

src/subcompositor.rs

kchibisov · 2023-03-24T17:28:14Z

ping.

i509VCB

This seems ready minus some minor commenfs

i509VCB · 2023-03-24T20:31:36Z

src/shell/xdg/frame/mod.rs

+pub mod fallback_frame;
+
+/// The interface for the client side decorations.
+pub trait DecorationsFrame: Sized {


Decorations feels redundant in the name imo

I feel like you'd need to rename the trait most of the time, so I've added the prefix, if anything, it's in a frame, not in decorations module.

src/subcompositor.rs

While the new decorations look the same as the ones before, the approach in drawing them was changed, and now decorations are more instant mode, meaning that you create and drop them when needed. Fixes Smithay#273.

kchibisov force-pushed the csd-decorations branch 6 times, most recently from b287561 to d85e846 Compare March 2, 2023 16:30

kchibisov commented Mar 2, 2023

View reviewed changes

i509VCB reviewed Mar 2, 2023

View reviewed changes

src/shell/xdg/frame/fallback_frame.rs Outdated Show resolved Hide resolved

src/shell/xdg/frame/mod.rs Outdated Show resolved Hide resolved

kchibisov force-pushed the csd-decorations branch 5 times, most recently from 8592055 to 220b917 Compare March 2, 2023 21:41

kchibisov force-pushed the csd-decorations branch from 220b917 to 12540aa Compare March 7, 2023 15:55

i509VCB reviewed Mar 13, 2023

View reviewed changes

kchibisov force-pushed the csd-decorations branch 3 times, most recently from eb028ac to 4d5dcfe Compare March 17, 2023 04:06

i509VCB reviewed Mar 17, 2023

View reviewed changes

src/shell/xdg/frame/mod.rs Outdated Show resolved Hide resolved

i509VCB reviewed Mar 17, 2023

View reviewed changes

src/subcompositor.rs Show resolved Hide resolved

kchibisov force-pushed the csd-decorations branch from 4d5dcfe to 0d21ecc Compare March 18, 2023 16:19

kchibisov requested a review from i509VCB March 20, 2023 01:33

i509VCB approved these changes Mar 24, 2023

View reviewed changes

wash2 approved these changes Mar 24, 2023

View reviewed changes

kchibisov added 2 commits March 25, 2023 00:52

Add subcompositor and subsurface helpers

bf82af7

window: add client side decorations interface

afce14c

While the new decorations look the same as the ones before, the approach in drawing them was changed, and now decorations are more instant mode, meaning that you create and drop them when needed. Fixes Smithay#273.

kchibisov force-pushed the csd-decorations branch from 0d21ecc to afce14c Compare March 24, 2023 21:58

wash2 merged commit be8168c into Smithay:master Mar 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

window: add client side decorations interface #362

window: add client side decorations interface #362

kchibisov commented Mar 2, 2023

kchibisov Mar 2, 2023

kchibisov commented Mar 2, 2023

i509VCB commented Mar 2, 2023

kchibisov commented Mar 2, 2023

kchibisov commented Mar 2, 2023

kchibisov commented Mar 4, 2023

kchibisov commented Mar 7, 2023

kchibisov commented Mar 8, 2023

i509VCB Mar 13, 2023

kchibisov Mar 14, 2023

i509VCB Mar 13, 2023

kchibisov Mar 14, 2023

i509VCB Mar 17, 2023

kchibisov Mar 17, 2023

kchibisov commented Mar 17, 2023

kchibisov commented Mar 24, 2023

i509VCB left a comment

i509VCB Mar 24, 2023

kchibisov Mar 24, 2023

window: add client side decorations interface #362

window: add client side decorations interface #362

Conversation

kchibisov commented Mar 2, 2023

Choose a reason for hiding this comment

kchibisov commented Mar 2, 2023

i509VCB commented Mar 2, 2023

kchibisov commented Mar 2, 2023

kchibisov commented Mar 2, 2023

kchibisov commented Mar 4, 2023

kchibisov commented Mar 7, 2023

kchibisov commented Mar 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kchibisov commented Mar 17, 2023

kchibisov commented Mar 24, 2023

i509VCB left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment