wlroots 0.17 #281

kennylevinsen · 2023-09-30T11:53:04Z

Makes cage build against wlroots master. We are still lacking an output request_state handler though.

OctopusET · 2023-11-21T15:46:32Z

https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3527
wlroots 0.17 is coming

joggee-fr · 2023-11-21T19:29:51Z

I have just checked it very very quickly. Hope I could give it a try soon.
At least, wlroots dependency must also be updated in meson.build and GitHub CI.

kennylevinsen · 2023-11-22T04:41:17Z

Build fails on not being able to find xwayland for some reason, will take a look at that later.

OctopusET · 2023-11-22T06:30:00Z

You can fix CI like this. Change xwayland alpine package to xwayland-dev
OctopusET@850dcd6

But there's other compile errors

OctopusET · 2023-11-22T06:49:25Z

https://github.com/OctopusET/cage/actions/runs/6953804611/job/18919514519

Here are the compile error logs.
I changed CI config to continue other jobs even one job fails. #291

OctopusET · 2023-11-22T07:09:20Z

This sway patch will be helpful for fixing this compile error. wlroots changed map/unmap behaviors.
https://github.com/swaywm/sway/pull/7498/files

It's also included on their breaking changes of 0.17.0 release (https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.17.0)

wlroots MR: compositor: unify map logic (https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4043)

kennylevinsen · 2023-11-22T16:52:03Z

This sway patch will be helpful for fixing this compile error. wlroots changed map/unmap behaviors. https://github.com/swaywm/sway/pull/7498/files

Indeed, I had missed the xwayland portion of this in chore: Use new map/unmap locations because I had not enabled Xwayland locally.

Should be all good now.

seat.c

output.c

joggee-fr · 2023-11-23T15:08:09Z

output.c

@@ -191,19 +191,6 @@ handle_output_commit(struct wl_listener *listener, void *data)
 	}
 }

-static void


Reading release notes for wlroots 0.17.0, it seems the WLR_OUTPUT_STATE_MODE flag is not expected to be handled in handle_output_commit()?

Right, we need to add WLR_OUTPUT_STATE_MODE to OUTPUT_CONFIG_UPDATED.

Maybe we also need to view_position_all()?

We are no longer expected to monitor mode changes in the commit handler, as this has moved to request_state.

Well, we still need to notify wlr-output-management-v1 clients of mode changes: #297

emersion · 2023-11-27T09:43:46Z

Nit: please avoid using prefixes such as "chore", this isn't something we do in cage.

The session is now stored explicitly, with wlr_backend_get_session being dropped.

kennylevinsen · 2023-12-12T20:40:08Z

The chore commits are gone - coming up with good summaries for all those commits was by far the hardest part of this PR...

emersion · 2023-12-13T15:51:20Z

xwayland.c

@@ -167,9 +167,9 @@ handle_xwayland_surface_new(struct wl_listener *listener, void *data)
 	xwayland_view->xwayland_surface = xwayland_surface;

 	xwayland_view->map.notify = handle_xwayland_surface_map;
-	wl_signal_add(&xwayland_surface->events.map, &xwayland_view->map);
+	wl_signal_add(&xwayland_surface->surface->events.map, &xwayland_view->map);


So… Unfortunately this won't work :/ the surface is not available before the associate event fires, and becomes invalid when the dissociate event fires…

Ah sorry, had missed that.

.github/workflows/main.yml

emersion · 2023-12-13T16:12:46Z

"ci: No need to test multiple compilers": can we discuss this separately maybe?

emersion · 2023-12-13T16:18:14Z

"output: Implement request_state event listener": hmm, instead of having to call the config update function everytime we might need to, I'd prefer to keep the output commit event handler. That would avoid mistakes where we forget to update the config.

See cage-kiosk/cage#281.

emersion · 2024-01-26T19:15:52Z

Any chance you have some time to have a look at this again @kennylevinsen?

This is replaced by monitoring for WLR_OUTPUT_STATE_MODE on commit.

For xwayland we must listen on associate/dissociate to set up and tear down the map/unmap event handlers instead of during surface create/destroy.

The latter implemented the KDE protocol which has been dropped.

wlroots as a subproject now yields the xwayland meson option to its parent. We need to match the type for this to work. This also adds support for auto mode, where xwayland is used if present but no warning is given otherwise.

wlroots backends no longer change state on their own, and instead send a request_state event. Monitor this event and apply any state we receive.

We previously used the wlr_output's built-in pending state and wlr_output_rollback. The modern state API is much nicer.

kennylevinsen · 2024-01-26T22:30:48Z

Any chance you have some time to have a look at this again @kennylevinsen?

Sorry, had missed the notification for comments!

"output: Implement request_state event listener": hmm, instead of having to call the config update function everytime we might need to, I'd prefer to keep the output commit event handler. That would avoid mistakes where we forget to update the config.

Not a big fan of checking things over and over when something is only rarely triggered from a few explicit places. Either way, I reverted to the commit handler.

emersion

Thanks!

emersion mentioned this pull request Oct 27, 2023

Switching between Sway and Cage VTYs behaves weird #284

Open

kennylevinsen force-pushed the scene_upgrade branch 2 times, most recently from 50fb260 to 32e41af Compare November 21, 2023 18:35

kennylevinsen force-pushed the scene_upgrade branch 3 times, most recently from e27edad to 46a80d2 Compare November 22, 2023 16:47

kennylevinsen changed the title ~~Chase wlroots changes~~ wlroots 0.17 Nov 22, 2023

joggee-fr reviewed Nov 23, 2023

View reviewed changes

kennylevinsen force-pushed the scene_upgrade branch from 46a80d2 to 2edecb8 Compare November 25, 2023 11:49

Winterhuman mentioned this pull request Nov 27, 2023

Make Xwayland optional at runtime #294

Merged

kennylevinsen force-pushed the scene_upgrade branch from 2edecb8 to 3d4f3fd Compare November 29, 2023 11:33

kennylevinsen added 4 commits December 12, 2023 21:36

Use new wlr_backend_autocreate signature

ef415f0

The session is now stored explicitly, with wlr_backend_get_session being dropped.

output: Remove wlr_output_damage include

c03a93b

output: Call wlr_scene_output_create

fd22dfe

output: wlr_scene_output_commit NULL options

71d7a80

kennylevinsen force-pushed the scene_upgrade branch from 3d4f3fd to c23b7fb Compare December 12, 2023 20:37

emersion mentioned this pull request Dec 12, 2023

output: update output manager configuration on mode change #297

Closed

kennylevinsen force-pushed the scene_upgrade branch from c23b7fb to e8839a2 Compare December 13, 2023 14:17

emersion reviewed Dec 13, 2023

View reviewed changes

.github/workflows/main.yml Outdated Show resolved Hide resolved

emersion mentioned this pull request Jan 5, 2024

Build fails against wlroots-0.17.1 #301

Closed

kyechou added a commit to kyechou/aur-cage-git that referenced this pull request Jan 16, 2024

Depend on wlroots0.16 for now until cage-kiosk/cage#281 is merged

827728a

See cage-kiosk/cage#281.

kennylevinsen force-pushed the scene_upgrade branch 2 times, most recently from 28bfc0f to 34d2cf1 Compare January 26, 2024 22:24

kennylevinsen added 14 commits January 26, 2024 23:29

output: Remove output mode handler

fe209f1

This is replaced by monitoring for WLR_OUTPUT_STATE_MODE on commit.

output: Use state field in wlr_output_event_commit

4b22c64

shell: Use new try_from surface getters

a7eff3d

shell: Use new map/unmap events

bec2601

For xwayland we must listen on associate/dissociate to set up and tear down the map/unmap event handlers instead of during surface create/destroy.

seat: New cursor/xcursor interface

694467d

Use new wlr_compositor_create signature

55b1472

Switch from wlr_idle to wlr_idle_notify_v1

1f9c75e

The latter implemented the KDE protocol which has been dropped.

meson: Convert xwayland option to feature type

777966a

wlroots as a subproject now yields the xwayland meson option to its parent. We need to match the type for this to work. This also adds support for auto mode, where xwayland is used if present but no warning is given otherwise.

ci: Fix Alpine xwayland dependency

82257e0

ci: Upgrade wlroots to 0.17

52e478c

meson: Bump minimum wlroots to 0.17

525ce9b

output: Implement request_state event listener

9106d9f

wlroots backends no longer change state on their own, and instead send a request_state event. Monitor this event and apply any state we receive.

output: Add scene output layout helper manually

8d265a1

output: Transition to wlr_output_state

27ef163

We previously used the wlr_output's built-in pending state and wlr_output_rollback. The modern state API is much nicer.

kennylevinsen force-pushed the scene_upgrade branch from 34d2cf1 to 27ef163 Compare January 26, 2024 22:29

emersion approved these changes Jan 26, 2024

View reviewed changes

emersion merged commit 8a00921 into cage-kiosk:master Jan 26, 2024
10 checks passed

kennylevinsen deleted the scene_upgrade branch January 26, 2024 23:05

kyechou added a commit to kyechou/aur-cage-git that referenced this pull request Jan 29, 2024

Update dependencies for cage-kiosk/cage#281 has been merged

fef5d71

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wlroots 0.17 #281

wlroots 0.17 #281

kennylevinsen commented Sep 30, 2023

OctopusET commented Nov 21, 2023

joggee-fr commented Nov 21, 2023

kennylevinsen commented Nov 22, 2023

OctopusET commented Nov 22, 2023 •

edited

Loading

OctopusET commented Nov 22, 2023

OctopusET commented Nov 22, 2023

kennylevinsen commented Nov 22, 2023

joggee-fr Nov 23, 2023

emersion Nov 24, 2023

kennylevinsen Dec 12, 2023

emersion Dec 12, 2023

emersion commented Nov 27, 2023

kennylevinsen commented Dec 12, 2023

emersion Dec 13, 2023

kennylevinsen Jan 26, 2024

emersion commented Dec 13, 2023

emersion commented Dec 13, 2023

emersion commented Jan 26, 2024

kennylevinsen commented Jan 26, 2024

emersion left a comment

wlroots 0.17 #281

wlroots 0.17 #281

Conversation

kennylevinsen commented Sep 30, 2023

OctopusET commented Nov 21, 2023

joggee-fr commented Nov 21, 2023

kennylevinsen commented Nov 22, 2023

OctopusET commented Nov 22, 2023 • edited Loading

OctopusET commented Nov 22, 2023

OctopusET commented Nov 22, 2023

kennylevinsen commented Nov 22, 2023

joggee-fr Nov 23, 2023

Choose a reason for hiding this comment

emersion Nov 24, 2023

Choose a reason for hiding this comment

kennylevinsen Dec 12, 2023

Choose a reason for hiding this comment

emersion Dec 12, 2023

Choose a reason for hiding this comment

emersion commented Nov 27, 2023

kennylevinsen commented Dec 12, 2023

emersion Dec 13, 2023

Choose a reason for hiding this comment

kennylevinsen Jan 26, 2024

Choose a reason for hiding this comment

emersion commented Dec 13, 2023

emersion commented Dec 13, 2023

emersion commented Jan 26, 2024

kennylevinsen commented Jan 26, 2024

emersion left a comment

Choose a reason for hiding this comment

OctopusET commented Nov 22, 2023 •

edited

Loading