wayland: implement session management#17732
Open
mahkoh wants to merge 1 commit intompv-player:masterfrom
Open
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
na-na-hi
reviewed
Apr 16, 2026
mahkoh
force-pushed
the
jorth/session-management
branch
from
8b1d0c6 to
5f5c725
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.
mahkoh
force-pushed
the
jorth/session-management
branch
from
5f5c725 to
aa28b41
Compare
kasper93
reviewed
Apr 17, 2026
| .timing_offset = 0.050, | ||
| .swapchain_depth = 2, | ||
| .focus_on = 1, | ||
| .wayland_session = "", |
Member
There was a problem hiding this comment.
No need for that. Generally all internal code in mpv, should treat "" and NULL string options the same way. We generally don't initialize them.
kasper93
reviewed
Apr 17, 2026
| static void xdg_session_replaced(void *data, struct xdg_session_v1 *xdg_session_v1) | ||
| { | ||
| struct vo_wayland_state *wl = data; | ||
| MP_WARN(wl, "Session has been replaced!\n"); |
Member
There was a problem hiding this comment.
Is the WARN correct here? This sounds more like an INFO or VERBOSE kind of information, no?
kasper93
requested changes
Apr 17, 2026
| if (!xdg_current_desktop) | ||
| xdg_current_desktop = ""; | ||
| const char *session = vo->opts->wayland_session; | ||
| char *full_name = ta_asprintf(talloc_ctx, "%16" PRIx64 "%s%16" PRIx64 "%s", |
Member
There was a problem hiding this comment.
Use bstr_xappend_asprintf please.
| char *xdg_current_desktop = getenv("XDG_CURRENT_DESKTOP"); | ||
| if (!xdg_current_desktop) | ||
| xdg_current_desktop = ""; | ||
| const char *session = vo->opts->wayland_session; |
Member
There was a problem hiding this comment.
Suggested change
| const char *session = vo->opts->wayland_session; | |
| bstr session = bstr0(vo->opts->wayland_session); | |
| if (!session.len) | |
| // handle unset |
(return NULL probably)
Comment on lines
+5033
to
+5034
| char *file_path; | ||
| file_path = mp_find_user_file(NULL, vo->global, "state", "sessions"); |
Member
There was a problem hiding this comment.
Suggested change
| char *file_path; | |
| file_path = mp_find_user_file(NULL, vo->global, "state", "sessions"); | |
| char *file_path = mp_find_user_file(NULL, vo->global, "state", "sessions"); |
| char *file_path; | ||
| file_path = mp_find_user_file(NULL, vo->global, "state", "sessions"); | ||
| mp_mkdirp(file_path); | ||
| file_path = mp_path_join(talloc_ctx, file_path, (char*)file_name.start); |
Member
There was a problem hiding this comment.
bstr.start may not be null-terminated, you cannot use it like so. Use mp_path_join_bstr please.
| return NULL; | ||
| if (bstr_validate_utf8(id) < 0) | ||
| return NULL; | ||
| return (char*)id.start; |
Member
There was a problem hiding this comment.
Cannot do that, bstr may not be null terminated. Return bstr or use bstrto0()
This file contains hidden or 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
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.
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.