wayland: implement session management#17732
Conversation
There was a problem hiding this comment.
Pull request overview
Implements Wayland session management support (xdg-session-management-v1) so mpv’s Wayland window can participate in compositor-managed sessions, with a new --wayland-session option to select a human-readable session name persisted under the user state directory.
Changes:
- Add xdg-session-management-v1 integration to the Wayland VO (create/restore session + persist session id to disk).
- Introduce
--wayland-sessionVO option and plumb it into option structs/defaults. - Extend Meson Wayland-protocol generation to include wayland-protocols 1.48 and document the new option/change.
Reviewed changes
Copilot reviewed 4 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| video/out/wayland_common.h | Store xdg session objects in Wayland VO state (guarded by HAVE_WAYLAND_PROTOCOLS_1_48). |
| video/out/wayland_common.c | Bind xdg-session-manager, create/restore sessions, and persist session ids under the state dir. |
| video/out/meson.build | Add wayland-protocols 1.48 feature detection and generate xdg-session-management protocol code. |
| options/options.h | Add wayland_session field to VO options struct. |
| options/options.c | Register --wayland-session and set default to empty string. |
| DOCS/man/options.rst | Document new --wayland-session option. |
| DOCS/interface-changes/wayland-session.txt | Record interface change for the new option/behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
mahkoh
force-pushed
the
jorth/session-management
branch
2 times, most recently
from
daf7f16 to
0552713
Compare
mahkoh
force-pushed
the
jorth/session-management
branch
from
0552713 to
8b1d0c6
Compare
mahkoh
force-pushed
the
jorth/session-management
branch
2 times, most recently
from
5f5c725 to
aa28b41
Compare
| char *xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP"); | ||
| if (!xdg_current_desktop) | ||
| xdg_current_desktop = ""; | ||
| const char *session = vo->opts->wayland_session; |
There was a problem hiding this comment.
| const char *session = vo->opts->wayland_session; | |
| bstr session = bstr0(vo->opts->wayland_session); | |
| if (!session.len) | |
| // handle unset |
(return NULL probably)
There was a problem hiding this comment.
wayland_session can't be null here.
There was a problem hiding this comment.
This function is guarded by the check in line 2940.
There was a problem hiding this comment.
At init? What if someone do set wayland-session bla from keybind/console?
There was a problem hiding this comment.
Also, this is arguably a nitpick, but I would consolidate checks in one place. So you call read_session_id and it gives you session or not, and act on it.
There was a problem hiding this comment.
I wasn't aware that these settings could change at runtime. In that case we'll need to make a safety copy of the variable during initialization since the name of the wayland session cannot change.
There was a problem hiding this comment.
Yes. Generally all options in mpv can change at runtime, but if it's not possible to change session in wayland, we have to read this option only once, like you noted.
mahkoh
force-pushed
the
jorth/session-management
branch
3 times, most recently
from
a7aeba7 to
8181ccf
Compare
mahkoh
force-pushed
the
jorth/session-management
branch
4 times, most recently
from
89e50e3 to
bed0b9a
Compare
If the compositor supports session management, the mpv window is always added to a session. The user can manage multiple sessions by using `--wayland-session=<human-readable-name>`. Human-readable names are mapped to session ids via files under `~/.local/state/mpv/sessions`. The file name is computed as a hash of XDG_CURRENT_DESKTOP and the human-readable name. If multiple mpv instances are started with the same session name, the latter mpv instance takes over the session. Upon session restoration, the mpv window is restored by the compositor according to its state from the previous session. What that entails is compositor policy.
mahkoh
force-pushed
the
jorth/session-management
branch
from
bed0b9a to
19093fe
Compare
If the compositor supports session management, the mpv window is always added to a session. The user can manage multiple sessions my using
--wayland-session=<human-readable-name>. Human-readable names are mapped to session ids via files under~/.local/state/mpv/sessions. The file name is computed as a hash of XDG_CURRENT_DESKTOP and the human-readable name.If multiple mpv instances are started with the same session name, the latter mpv instance takes over the session.
Upon session restoration, the mpv window is restored by the compositor according to its state from the previous session. What that entails is compositor policy.