mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bug/xwayland-ready-listener' into refactor/wlr-drag-icon

Browse source
This commit is contained in:
Tony Crisci 2017-11-19 10:11:39 -05:00
commit 390b526450
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/rootston/desktop.h
View file

@ -50,6 +50,7 @@ struct roots_desktop {
#ifdef HAS_XWAYLAND #ifdef HAS_XWAYLAND
struct wlr_xwayland *xwayland; struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface; struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
#endif #endif
}; };

5
rootston/main.c
View file

@ -59,8 +59,9 @@ int main(int argc, char **argv) {
ready(NULL, NULL); ready(NULL, NULL);
#else #else
if (server.desktop->xwayland != NULL) { if (server.desktop->xwayland != NULL) {
struct wl_listener xwayland_ready = { .notify = ready }; wl_signal_add(&server.desktop->xwayland->events.ready,
wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready); &server.desktop->xwayland_ready);
server.desktop->xwayland_ready.notify = ready;
} else { } else {
ready(NULL, NULL); ready(NULL, NULL);
} }