blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Tony Crisci 2017-11-19 10:11:39 -05:00
parent 3b74db467b 90d2eca218
commit 390b526450
2 changed files with 4 additions and 2 deletions
Show Stats 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
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
#endif
};

5
rootston/main.c
View File

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