RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland_common: respect close events 

Overlooked.
Also add a comment and only set the parent if WinID is set.
This commit is contained in:
Rostislav Pehlivanov 2017-10-05 16:43:44 +01:00
parent 8d8d4c5cb1
commit da30f0ba2b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/wayland_common.c
View File

@ -717,7 +717,7 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
}
if (found > 1)
MP_VERBOSE(wl, "Registered for protocol %s\n", interface);
MP_VERBOSE(wl, "Registered for protocol %s, ver %i\n", interface, ver);
}
static void registry_handle_remove(void *data, struct wl_registry *reg, uint32_t id)
@ -862,6 +862,8 @@ static void handle_toplevel_config(void *data, struct zxdg_toplevel_v6 *toplevel
static void handle_toplevel_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel)
{
struct vo_wayland_state *wl = data;
mp_input_put_key(wl->vo->input_ctx, MP_KEY_CLOSE_WIN);
}
static const struct zxdg_toplevel_v6_listener xdg_toplevel_listener = {
@ -879,9 +881,10 @@ static int create_surface(struct vo_wayland_state *wl)
wl->xdg_toplevel = zxdg_surface_v6_get_toplevel(wl->xdg_surface);
zxdg_toplevel_v6_add_listener(wl->xdg_toplevel, &xdg_toplevel_listener, wl);
if (wl->vo->opts->WinID >= 0)
if (wl->vo->opts->WinID >= 0) {
wl->xdg_tl_parent = (struct zxdg_toplevel_v6 *)(intptr_t)wl->vo->opts->WinID;
zxdg_toplevel_v6_set_parent(wl->xdg_toplevel, wl->xdg_tl_parent);
zxdg_toplevel_v6_set_parent(wl->xdg_toplevel, wl->xdg_tl_parent);
}
zxdg_toplevel_v6_set_title (wl->xdg_toplevel, "mpv");
zxdg_toplevel_v6_set_app_id(wl->xdg_toplevel, "mpv");
@ -1070,6 +1073,9 @@ int vo_wayland_reconfig(struct vo *vo)
MP_VERBOSE(wl, "Reconfiguring!\n");
/* Surface enter events happen later but we already know the outputs and we'd
* like to know the output the surface would be on (for scaling or fullscreen),
* so if fsscreen_id is set or there's only one possible output, use it. */
if ((wl_list_length(&wl->output_list) == 1) || (vo->opts->fsscreen_id >= 0)) {
int idx = wl_list_length(&wl->output_list) == 1 ? 0 : vo->opts->fsscreen_id;
struct vo_wayland_output *out = out = find_output(wl, idx);