compositor: implement wayland socket handover #6930
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ferdi265
force-pushed
the
feature-socket-handover
branch
from
94d994c
to
4a7c56e
Compare
vaxerski
reviewed
Jul 19, 2024
vaxerski
reviewed
Jul 19, 2024
Ferdi265
force-pushed
the
feature-socket-handover
branch
from
ff41cf2
to
8a396b8
Compare
|
rebased onto latest main |
|
oopsie, someone didn't run clang-format :P |
Ahh sorry, should be correct now. |
This commit implements the compositor side of the Wayland socket handover protocol as described in the [KDE Wiki]. The CLI options are chosen so that they are compatible with Kwin. [KDE Wiki]: https://invent.kde.org/plasma/kwin/-/wikis/Restarting
Ferdi265
force-pushed
the
feature-socket-handover
branch
from
c2a4871
to
2a6ba05
Compare
|
also, cleaned up the history. |
vaxerski
approved these changes
Jul 19, 2024
|
Note: Labwc has voiced some concerns on standardizing on these particular CLI options for socket handover. I created a discussion issue for figuring out a mechanism for socket handover that more compositors can agree on in this wl-restart issue. These CLI options will continue to be supported by wl-restart (likely indefinitely), and will continue to be the default for the time being. Alternative socket handover mechanisms could possibly bring support for Systemd socket activation for Wayland compositors in the future. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
This PR implements the compositor side of the Wayland socket handover protocol as described in the KDE Wiki. The CLI options are chosen so that they are compatible with Kwin:
Hyprland now accepts the CLI options
--socket NAMEand--wayland-fd FD, which pass the name of the Wayland display socket and the Wayland display socket fd number respectively. If given, Hyprland will use these instead of finding a free Wayland display socket name and creating it.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
This allows for Hyprland to be used with a helper tool that automatically restarts the compositor on crashes, and allowing clients to reconnect after the compositor restart and survive the crash. The reconnecting clients look like new clients to Hyprland and perform all the same steps as a fresh Wayland client would. No additional handling is required on the side of Hyprland.
The helper tool finds and creates the Wayland socket and launches Hyprland with the new CLI options, restarting it when it exits with a non-zero exit code. Two such helper tools currently exist as far as I know:
kwin_wayland_wrapper(only for KDE)wl-restart(developed by me)Is it ready for merging, or does it need work?
This PR works well from my personal testing.