RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-11 04:01:31 +00:00
Code Issues Releases Wiki Activity

wayland_common: fix initialization order issue with protocols

Browse Source 
This broke DND under (apparently) GNOME and KWin, but not sway.

fixes: 2274311b25
This commit is contained in:
sfan5 2024-02-28 17:25:13 +01:00
parent 78cedac844
commit 878b76f75e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/wayland_common.c
View File

@ -1474,10 +1474,6 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
seat->id = id; seat->id = id;
seat->seat = wl_registry_bind(reg, id, &wl_seat_interface, ver); seat->seat = wl_registry_bind(reg, id, &wl_seat_interface, ver);
wl_seat_add_listener(seat->seat, &seat_listener, seat); wl_seat_add_listener(seat->seat, &seat_listener, seat);
if (wl->dnd_devman) {
seat->dnd_ddev = wl_data_device_manager_get_data_device(wl->dnd_devman, seat->seat);
wl_data_device_add_listener(seat->dnd_ddev, &data_device_listener, seat);
}
wl_list_insert(&wl->seat_list, &seat->link); wl_list_insert(&wl->seat_list, &seat->link);
} }
@ -2490,7 +2486,13 @@ bool vo_wayland_init(struct vo *vo)
} }
#endif #endif
if (!wl->dnd_devman) { if (wl->dnd_devman) {
struct vo_wayland_seat *seat;
wl_list_for_each(seat, &wl->seat_list, link) {
seat->dnd_ddev = wl_data_device_manager_get_data_device(wl->dnd_devman, seat->seat);
wl_data_device_add_listener(seat->dnd_ddev, &data_device_listener, seat);
}
} else {
MP_VERBOSE(wl, "Compositor doesn't support the %s (ver. 3) protocol!\n", MP_VERBOSE(wl, "Compositor doesn't support the %s (ver. 3) protocol!\n",
wl_data_device_manager_interface.name); wl_data_device_manager_interface.name);
} }